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
* Switches out the three billion args of electrocute act for flags
* Adds autodoc to electrocute flags, sets the boolean I removed and tries to fix the ed209 file
* tries to fix ed209 again
* Fixes 209 hopefully
* Finally fixes that darn file
* one final one to fix the diff
* Or i guess i'll just do it myself
* Doubtful improvement
* Switches out all the magic numbers with defines
* Thanks travis for finally finding a real error
* properly resolves some left over conflict
* Reverts italics-span back to no color.
* Cleans up many extra spaces and indents.
* Adds 'hear' span class.
* Replaces all 'italics' used in heard messages with 'hear'.
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
About The Pull Request
Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game
This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
About The Pull Request
Completely removes item_color and the clusterfuck of bad programming it caused.
In places where item_color was used for entirely unique purposes it was split off and renamed to a new var on that typepath only, or refactored so it wasn't needed
In places where item_color was used as a dye color, it was converted to the new dye_color var
In places where item_color was used as the worn overlay it was removed and instead now icon_state is always used as the clothing overlay.
A new mob_overlay_icon var was added for manually setting where the mob overlay icon path is for specific items.
Moved some mob overlay files relating to clothing to their own directory as well for organization purposes.
Totally refactors washing machines, instead of the horrible abortion that was iterating through the typepath it now uses a registry of dye results.
Some bonus functionality to come out of this:
the washing machine now supports arbitrary dye colors.
Why It's Good For The Game
It's been 4 years since the "this should be deprecated soonish" comment was added, and this var is a shitpile of confusion if you just trace the usage of it.
Changelog
cl
add: Washing machines now support arbitrary dye color
add: Washing machines now dye nearly every item.
refactor: lots of backend changes to clothing overlays, report any issues
/cl
* 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
* bungo
* Adds galaxy thistle and spaceman's trumpet.
* Traits update + new mushroom.
Adds new traits and mutability variable.
* Fixes bungo pit contents
* Bungotoxin lethality is now more in line with other good toxins.
* Adds hair dyeing functionality + lowers enzyme
* flags, plant stat adjustments, runtime fix, spelling and mutations.
* Nerfs toxin content of bungo pits to reduce hypodermic induced lethality
* Name getter fix, adds rarity, better documentation, carnivory tweak
* Bungotoxin has more tells.
* fixies
You can click seeds with a pen to change the name of the plant, the seed's description, or the plant's description. After planting in a hydroponics tray the tray updates with the name and description of the plant inside it.
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
This was using the wrong inventory proc, trying to remove the grown
from the user before it was ever in them, meaning the grown trash item
had the wrong loc and causing a runtime.
I also took the opportunity to autodoc.
This makes lavaland atmos random per round. You won't get eternally burning hell worlds or vacuums but it's nice for a bit of variety.
Admins can edit the gas mixture for all of lavaland at once if they want to ruin some miners' day.
image
cl
add: Lavaland atmos is no longer a preset gas mixture and varies per round
tweak: Bonfire minimum oxygen content has been reduced
/cl
* Fixes antimagic not working in hand slots
* proper changes
* Update code/modules/mining/lavaland/necropolis_chests.dm
Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
* 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
About The Pull Request
Adds a rake (reskinned cultivator) and a wooden hatchet to the ashwalker base. Replaces their bucket with a wooden bucket.
Added crafting recipes for the rake and wooden bucket.
Why It's Good For The Game
It looks more flavourful (inb4 where did they get the wood from) and adds a bit of functionality to unused content (i.e. ashwalker farming).
Changelog
cl
add: Added wooden farming implements to the ashwalker base.
add: Makes rakes and wooden buckets craftable.
/cl
* corpse flower init
* icons
* fixes some bad math
* removes istype helper
* play test changes
* examine text
* .
* found where the conflicts happened
* same
nemvar
Qustinnus
Mickyan
ATH1909
Fikou
kingofkosmos
oranges
nemvar
81Denton
Akrilla
Rob Bailey
Tad Hardesty
moo
cacogen
Krysonism
CRITAWAKETS
spookydonut
MMMiracles
SgtxRootbeer
bgobandit
ShizCalev
Emmett Gaines
vuonojenmustaturska
XDTM
nemvar
granpawalton
Tlaltecuhtli