* fixes a bunch of turfs being active roundstart
* some ruins
* qwerty dun broke it
* main stations
* that should do it
* i'm blowing up qwerty
* should be it
* empty commit to check ci
* merge fix
* yippie
* joyous
* lavaland tax
* regex w
* I'm gonna fax mapmerge a low teir god gif
* SOMEONE ELSE GOTTA GET FAXED
* Update code/controllers/subsystem/SSair.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
---------
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* NanoMap Auto-Update (Sun Jul 2 02:02:08 UTC 2023)
* Sorting mob_spawn file to have 2 categories.
* Holy jesus
So many files using alive and corpses... send help.
* Delete wizardcrash.dmm
* Trying..
* fixing mime/clown .dmm stuff
* Test
* Fix UpdatePaths file
now it should contain all corpses/alive path swapping.
---------
Co-authored-by: NanoMap Generation <action@github.com>
* Tweaks to greed ruin and die of fate
* Delay between effects
* moved and updaated traitor items
* More tweaks to traitor item list
* Update code/game/objects/items/weapons/dice.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Sirryan review
* Lets decrease the money even more
* experimental KA instead of alien pistol
* emp dmg for machines when interacting
* brainloss
* Code improvment
* forcewall removal
* Turning into a list
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Medical and RnD DMI files split
* Cargo DMI split
* Security DMI split
* Engineering DMI split
* Captain DMI split
* Civilian/service DMI split
This one hurt
* Forgot about this one
* Color DMI split
* Purges everything that was delted up until this point
... with a blindfold and a shotgun
* Dress and suit DMI split
* Pants and shorts DMI split
and merges pants and shorts files... shorts are pants, right?
* Donator/fluff jumpsuit clothing organisational relocation
* e
oops
* So this is used, repath bad
* Random commit
* Costumes DMI split and jumpsuits purge
* Some fixes
* pennywise
* Centcom DMI split
* SolGov DMI split
* Retro DMI split
* Syndicate DMI split
* Misc DMI split
* centcom officer
* Kills off uniform.dmi completely
* last fixes
* lastest fixes
* vox navy gold conflict
* civilian barber
* Tourist observers work now
* Hopefully working non-human humanoid clothing
* This being in suit.dmi is one of the reasons I made this PR
* This shouldn't be here
* Late night coding
* Pun Pun regains his drip
* Last fixes
* security/OFFICER
* Most important - clown fix
* working subtypes good
* Fixes chameleon jumpsuit
* Proper QM pathes
* Fixes jumpsuit rolling with the power of poor quality code
* Cargo tech character setup fix
* else instead
why didn't I do this in the first place
* PURP
* Fixes broken character setup job clothing
* CC suit fix
* Psychedelic jumpsuit proper path
* You must wear the jumpsuit to adjust it
* wip
* goodbye two pizzas
* commit to pizza time
* pizzaaaaaaaa
* getting there
* hopefully final
* pizza
* do you like me now CL?
* Update code/modules/food_and_drinks/recipes/recipes_oven.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* fixing suggestions
* Update paradise.dme
* back on track
* removing tablecrafting recipies, switch back to oven recipeis
* remove unused raw pizza sprites
* re-add KalevTait's suggestion
* fix merge conflict
* merge conflict fix i guess???
* i swear if this is still conflicted
* fixing trailing newlines
* moves parent calls
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b.
* Icon conflict
* Fix organ damage
* Don't ask how. Why. It's like that on prod too.
* Cutting down on things and updating from TG.
* More flexible. Just in case the thing you stuck it on didn't destroy.
* Hydro was one the things I touched earlier on, better rework it
* Reviews
* Cleaning up further, also bri'ish
* Undo a change I did, and switch over to a more recent implementation
* Update biogenerator.dm
* Rolling back to old airlocks, but with new duct taped note
* Functionally the same. I'd just rather not have the smoothing happen there
* Went over APCs again
* Fix welding helmet names in species files
* Update airlock.dm
* Update persistent_overlay.dm
* Oh, topic
* Refactors Mutations
* traits
* more work
* styling fix
* yet even more work
* oh hush
* almost there
* it continues yet further
* and that's genetics done
* and that's it folks
* last bit and golem fixup
* oof
* oops
* tweaks and fixes
* styling
* Handlers converted, now to fix 3532 compile errors
* 3532 compile fixes later, got runtimes on startup
* Well the server loads now atleast
* Take 2
* Oops
* Adds support for self-filling reagent containers
* Sets tool_behaviour on the default set of tools
* Fixing merge conflicts
* Refactors welder to use tool behaviour
* The refactor: part I
* The refactor: part II
* Tool Refactor Part III: Revenge of the Maint
* Tool Refactor Part IV: A New Hope
* Tool Refactor Part V: The Oldcoder Strikes Back
* Tool Refactor Part VI: Return of the Coder
* VII
* Holy shit, it compiles?!
* Nannek I completed your TODO, you owe me ice cream
* Tool helpers; telepad is compliant
* Bugtest, Round 1: Fight
Fuck refactoring disposals
* Buggfixing, Round 2: Electric Boogaloo
* Personal crafting uses tool behaviours now
* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing
* multitool_check_buffer change; removes some useless things in tool_helpers
* proc name change
* TRUE/FALSE changes
* Bugfixing, Round 3: A Good Day To Bugfix Hard
Fixes multiple issues raised by the testmerge
* Minor style changes
