removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)
this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.
also applies materials to everything, with fixes, which can close#46299
* Adds attacktext2 and friendly2 messages for personal "you" messages in combat.
* Adds response_help2, response_disarm2 and response_harm2 -messages for interacting with simple animals. Also removes unnecessary, already inherited, ones.
* Small extra: Adds personal messages for gun firing.
* Adds personal messages to grabs and fixes shoe stealing messages.
* Fixes open someone else's internals valve pronoun.
* Replaces response_help --> response_help_continuous, response_help2 --> response_help_simple etc. Also adds autodoc to simple_animal.dm variables.
Ports carpets from TauCetiStation
Original PR: TauCetiStation/TauCetiClassic#2989
Adds tables to match the carpets
Carpets Good. Tables Good.
Changelog
cl
imageadd: 8 new carpets and fancy tables
add: exotic carpet crate
/cl
* a
* GRILL GANG
* sipp
* sip
* seep
* grug
* FSAIUGANOHNHOE
* bru
* a
* finish him
* compilies ^w^
* WOOO
* holy crap
* woo
* a
* h
* woo
* woo
* woo
* awoo
* aa
* aw shet
* heck you floyd
* at ath
* awo
* we like compiling code
* awo
* coal mat
* awoo
* aasdga
* a
* nice
* awoo
* awwoooooooooooooooooooooooo
* awoo
* spaceport bars
* grill gang
* aw
* awooo
* yee
* aw
* flod
* awoo
* awoo
* yesyesyyes
* a
* awoo
* holy sht
* h
* awoo
* awo
* aaaaaaaaa
* awoooooooooo
* awoo
* aw man
* honk
* well boys we did it
* oh mama mia
* ok cobby flushed
* awoo
* removes fun
* yeep
* i just said something
* vruh obama
* ye
* awoo
* awooooooo
adamantine and mythril are now datum mats (mythril still admin only), adamantine has 1.5 strength buff to whatever is made out of it, mythril adds rpg loot elements to whatever is made out of it
you can now put plastic, adamantine and mythril in the autolathe and coin mint
you can now put titanium in coin mint
switches a bunch of stuff in cargo exports, including mythril and plastic being worth cash money
coin code has been changed to datum mats, the custom sprites have been lost except for antag token
About The Pull Request
This PR resprites the D6, adds two money bags and a bag of 5 d6'es to the bardrobe. Be on the look out for the expensive ebony dice.
I have also made code improvement by filling dice bags using PopulateContents() and giving the special dice their own loot spawner.
Why It's Good For The Game
I have recently in anticipation for the roulette update tried playing some simple dice games with my bar patrons to great success. I did however notice that the old d6 sprites were quite bad, so i decided it was time for a resprite,
I have also added money bags to the BarDrobe since those will be needed if more forms of gambling are added to prevent greytiders from stealing all your winnings.
DiceComparasion
EbonyDiceLarge
Changelog
cl
add: Money bags can now be obtained from the BarDrobe.
add: A bag of d6'es is now available in the BarDrone. May contain a rare die.
imageadd: New d6 base sprites and variant.
refactor: Improved the way the normal dice bags is populated.
/cl
About The Pull Request
Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls
This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE
I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game
Code usability
* 150 hours
* it compiles guys
* PERF
* meta conflictor
* oldcabin
* Revert "meta conflictor"
This reverts commit 812343ca615e5b00711786be4413ce3301cfcc90.
* oldmeta
* TAKE 5000
* NAME THIS
Also redoes Multiver/Palletta
* FRICK U FIZ
* NERF PERF
* comment cringe
* Checks for restraints/incapacitated for ichiyuri
* URIKA
Removes Healing-Scaling of Ichiyuri, Nerfs Healing of Aiuri.
* organ
* please upvote this
* maps...
* Gives Instabitaluri a Brand Name
Oh wow it's synthflesh 😆
* Update cat2_medicine_reagents.dm
* what kinda characters is Krys using
* adds capitalism firing pin for late-stage capitalism
* purchase prompt so you can't bankrupt the captain with a rigged gun
* prompt spam check, cargo crates for pins, extra warning message for accepting payment but not having enough to pay out
* test stuff please ignore
* pay-per-shot system, alert instead of input, minor cleanup
* fuck off clown
* range check to prevent long-range purchasing
About The Pull Request
Moves requests and cart below the cargo pack list, so you dont need to find the right button after everything you buy. Resized the cargo window, less airy. Added a toggle for buying privately, less buttons should improve performance somewhat.
Why It's Good For The Game
Less annoying UI.
Changelog
cl Skoglol
tweak: Cargo console UI touched up a bit. Requests and cart moved below the cargo packs for less button shuffling, buying privately is now a toggle, resized window slightly.
/cl
About The Pull Request
repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game
improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog
cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
* migrates the shield generator to the powered typepath
* map update
* fixes wire unsecuring weirdness
* this should go here actually
* minor reformatting + documentation
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
* Adds adjustLiverLoss & getLiverLoss procs to carbon
* Adds trophazole
Adds trophazole, a brute healer that makes doctors take a more holistic approach to heal, It is highly reagent efficient by converting nutriment to healing peptides. Creates an avenue for cooperation between kitchen and medbay.
* Adds rhigoxane
Rhigoxane is a chilly burn healer that works best in a spray bottle and is capable of extinguishing fires.
* Adds thializid
This tox healer has great potential and mixability, balanced by requiring the doctor to take note of the patients liver health as well as using proper dilution and an iv pole; that wont fit in a powergamers pocket.
* Charcoal + trans_to changes
Makes charcoal only work when ingested, and adds a new proc in reagent holder, lets trans_to react the transferred reagents if a method is chosen.
* Medical + Syndicate spray bottles
Medical spray bottles have been added to techweb under the biotech node for medical vapor application, alt click to change their skin.
Two suspicious spray bottles have been added as expensive contraband items in the chemdrobe. They have one extra spray range and a random suspicious skin from a pool of 8.
The large spray bottle and the space cleaner bottle also have new icons.
In addition trophazole and MMF have new colors.
* Adds chempacks
the IV medicine bag, or chem pack is the blood pack analogue for chems, it is easy to fill like a beaker but can also be permanently sealed to prevent spillage and mitigate tampering. It can be renamed with a pen. Both the new chem pack and the old blood pack have been added to the medical lathe and biotech node.
* Adds recipes to thializid and trophazole
Also fixes the rhigoxane recipe
* Medsprays are now medigels + fixes
chem packs can now be stored in the smartfridge and chem bag.
Medsprays were renamed medigels to reduce confusion. Calling them medical sprays made no sense since they apply chems through the patch method.
The lore for the new medigels is that they spray a thick gel onto the skin that dries into a film.
* minor fixes + mint frosting
I have tried to fix the problems people have pointed out. And the peptides now taste like mint frosting.
* Readds my cleaner sprites
* Adds liver damage to thializid + adds on_transfer proc
Thializid has a liver cost, the cost is worse if you have already sustained liver damage. Fixes weirdness by moving the reagent conversion effects from reaction_mob to on_transfer
* Fixes chem bag examine
The chem bag examine now werks, also fixed a typo in the description.
* Adds a clumsy check to sealing the chem pack
* Makes kelo, bicard and anti-tox unmixable.
I have retained the tricord recipe for now in case someone manages to collect all 3 through non-dispenser means. Think of it like collecting all the dragon balls but lame.
* Makes damp rag apply on_transfer effects
* glass and food now work with trophazole
glasses and food now call the on_transfer proc via trans_to
* Another round of fixes
Replaces 0/1 values with TRUE/FALSE where appropriate. Removes the debug printout from the spray bottle reskin. Replaces one instance of L.damage with C.GetLiverLoss().
* Rhigoxane recipe is now COOLER
200k was too warm since cryostylane cools down so much by itself upon mixing.
Now the chemist has to choose between adding oxygen for instant cooling or using the heater/cooler to conserve energy.
* Removes the seal() proc and moves its guts into AltClick
* Item_state switching moved to reskin_obj
* Fixes missing medical sprayer left inhand
the sprayer_med_yellow inhand sprite now has the correct name.
* Fixes inhand updating
* Update code/modules/mob/living/carbon/damage_procs.dm
Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
* Update code/modules/mob/living/carbon/damage_procs.dm
Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
* Tries to add typecache
* Moves the typecache and makes it static
* Payment generation rework and no repeated target
* Blacklist
* Remove pod explosion
* contractor baton
* darker highlight
* Slight increase for the higher paying contracts
* Victims get healing injected to bring them out of soft crit/crit
* pod send fix
* Text changes
* More text tweaks
* New baton - custom sprite/sound
* Better sound - fixes
* Stutter
* text
* classic_baton rework
* attack silicons still, and only show charging for new baton
* Properly attack/stun silicons where appropriate
* . list
I added empty boxes to cargo, I decided to follow the restriction
stated in the file and set the price to 700, but my original intention
was to have it be 500 so it isn't a completely horrible loss to the
QM, which a more experienced contributed can do if they like. Allows
Cargo to store bulk items easily after they inevitably sold every
crate in the station.
* QoL and location bugfix
* QoL and bugfixes
* Further fixes
* Name fix
* Text changes
* revert delay
* Same fix for returning
* description update
* New TC generation
* Slight delay for ransom cut, so they can hear the beep
* Give a written guide
* Third item
Alright I'm sold, let's try it
* Forgot to add text changes in line with the new item
* Merge conflict
* In datum
* 1/4 done? maybe?
* more
* stuff
* incremental stuff
* stuff
* stuff & things
* mostly done but not yet
* stuffing
* stuffing 2: electric boogaloo
* Git Commit and the Kingdom of the Crystal Skull
* make it actually compile
* found more stuff
* fixes
* fix AI laws appearing out of order
* fix windows
* should be the remaining stuff
* this time for real
* i guess it should compile too
* fix sechuds
* De-linkifies names in deadchat_broadcast(), makes deadsay css class default too
* Makes the source argument come after message, since it is optional
* Removes excess </span>
* Emag bounty computer to show contract connection
* Corrupted text helper
* WIP on corrupted text
* Randomly corrupt text when looking at connect screen
* Barebones accessible Syndicate bounties screen
* Contract barebones and Synd UI work
* Further text changes, antag checks
* Further UI changes, full contract generation with areas/target
* dropoff point checks, and move to uplink item for requesting bounties
* WIP contract uplink item
* Contract uplink and continued contract improvements
* Completed contract uplink, and continued contract work
* Droppod WIP
* Further droppod work
* Mob WIP
* Further mob WIP
* No mob
* Callback for putting in mob
* Further WIP with pod checks
* Better location picking and signal fix
* Further pod changes, WIP of payouts
* Overall finished payment/contract system
* Code cleanup
Revert changes to bounty console
Remove debug messages
* Small refactor
* Add kit with set and randomised items.
* Fix box
* Very minor flavor text for inserting into pod, plus roundend text
* Pod return sound
* Contract uplink slight styling changes
* We don't keep giving telecrystals until they literally can't hold anymore
* Ship them off to ninja base instead
* Nerf bring them dead, but give a nice boost for bring them alive
Overall this is a nerf, so we also throw in an agent card to the bundle
* Ship them back
* Minor text changes and slight TC change
* Always give the black and red variant space suit
* Error sounds
* Dropoff area locator
There's sometimes duplicates, i.e. security office - but only one of them will work. This shows you where to go.
* Small fixes
* Bugfix, further changing of TC
* Ransom wip
* Ransom system
* Few changes
* Properly pay for ransoms and appropriate logic for dropoffs
* Terminal sounds
* Talk on command channel when ransom is given, or if they were too late
* Change to announce system
* Announcements/auto pay ransom
* Proper wait
* Name pods properly
* Don't send blacklisted items
* fix
* Improvements
* Announcements are less huge...
* Not a file...
* Improvement
* Drop them not in a wall
* Halves eye blur and styles payment vend
* No memes allowed
* corpse flower init
* icons
* fixes some bad math
* removes istype helper
* play test changes
* examine text
* .
* found where the conflicts happened
* same
cl Naksu
code: reagent IDs have been removed in favor using reagent typepaths where applicable
fix: mechas, borg hyposprays etc no longer display internal reagent ids to the player
/cl
81Denton
moo
nemvar
Qustinnus
William Wallace
kingofkosmos
Twaticus
AnturK
Fikou
skoglol
James
Krysonism
Rob Bailey
MMMiracles
Tlaltecuhtli
Gamer025
Bobbahbrown
Akrilla
MadoFrog
SpacePrius
vuonojenmustaturska
FrankFo
shellspeed1
granpawalton
plapatin
oranges
Nalzul
actioninja