* amogus
* Revert "amogus"
This reverts commit ebaa99c77b.
* Part 1
* rest of the airlocks
holy shit that took a long time
* part 2
* part 3
finale
* conflict resolution
* fixes warnings
* fixes paneloen airlock emissives
* adds back changes from #18145
* #18085 sprites
* SteelSlayer Review
readded process in status_display, idk why I removed it, it broke some functionality
* future proofing firedoors
Talked with the contributor who added emissive appearances to the codebase. As of now they wont block them unless they spawn as closed, but with future PR merges this code will work.
* solar panel PR conflict resolve
* pain
* small fix
* farie82 suggestions
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* farie82 suggestions part 2
* farie82 suggestions part 3
* finalle
pog champ ers 2000
* farie82 suggestions the sequel
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* SteelSlayer Suggestions
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@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
* grammar fixes
cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -
* should fix the merge conflict
0 to FALSE
* unconflicts
panther will have to be fixed at a later date
* a new coat of paint
* no shooting teammates on spawn for 100 damage
* datumization part 1, makes DS more OP, spacing fix
* hnng still broken but better
* breaks stuff less 99%
* mostly tgui
* oops, removes left over things from testing
* seperate tgui
* undo changes to ERT file and ERT manager
* build TGUI, front end is working
* minor fix, still broken
* this hurts me
* few small changes
* please dont fail
* mind code runs, but it doesnt work
* logging good, tgui built, will finish later
* mind code hurts, tgui should deconflict
* part one of giving up on TGUI
* 3 days of debugging, 2 lines of errors fixed
* no more unneccessary spawners
* Revert "no more unneccessary spawners"
* wow it works
* tgui, deconflict please
* a little clean up
* little more cleanup
* Sirryan addressed pt1
* Oops should commit this before the next commit
* DS isnt an option in one click antag, nuke it
* oops forgot this one small bit
* wow, simple code works
* oops, forgot to address, doesnt fix headset
* ds headset was broken long ago
* removes testing implants
* addresses requests
* get addressed code, you will be good
* few code improvements
* address moxian
* Makes deathsquad naming consistent
* this comment is true again
* a little precaution to stop AFKs
* no nuke code? no problem
* bing bam boom, more addressing
* no more runtimes I think
* clarified a few things
* gloves now show again following #18190
* Update code/game/objects/items/weapons/explosives.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* okay I'm a bit stupid
* deathsquad jumpsuit desc update
* CI my beloved, have a fix
* deathsquad gets their proper icon
* Revert "deathsquad gets their proper icon"
This reverts commit a52519305b.
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Reworks Flashbangs
Flashbangs no longer weaken, instead causing those affected to crawl and additionally makes them confused.
* Hippie Repellent
Reworks Flashbangs. Converts weaken to crawling. Adds confusion.
* Riot Control
Fixes a typo.
* Update code/game/objects/items/weapons/grenades/flashbang.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* test
* holdup
* more guns
* EVEN MORE CHANGES
* fuck
* eugh
* actual shit editor, love DM
* i think I just need inhands now
* final review, test pr
* ooops
* holy shit
* new maka
* foamforce new makarov
* this is going to be hell to review. is it?
* AHHHHH
* small melee fixes
* GOD DAMN STAFF
* as above
* i thought i fixed you, also grip added to wt550 inhand
* acutally deconflicts with the new camera pr, removes the new animated missle(rip)
* some fixes
* a bit more sprite cleaning
* i am suffering
* reverts 9mm
* seemingly forgot a few
* i think we're good now
* crawling?
* knockdown. CONTAINS CHANGES THAT NEED REVERTING
* plotting can_moves death
* CANMOVE IS DEAD
* mappers are insane
* removes todos as the are todone
* decreases crawling speed
* silly-con fixes
* surgery fixes
* fixes death
* pAI fixes
* removes var/lying
* runtime fix
* decreases default crawling speed
* correct crawling dir
* some more fixes
* stunbaton tweak, revert later
* rejuv fix
* restraint and incapacitated refactor
* crawling dir in line with TG
* fixes vehicle movement and grabs
* alien rest fixes
* antistun fixes
* fixed fall sounds
* forgor to stage this
* first review
* canmove zombie dispersal
* fix
* lots of fixes
* defines
* fixes the trait helper
* if you got no legs you can still crawl
* sillyconfix
* no reverty keepy
* jaunt fix
* hopefully fixes perma sleepy zzz
* admin rejuv temp fix
* rest canceling
* antistun chems now remove knockdown
* buckle offset fix
* fixes some stuff
* crawling delay = 4
* descuffs bed
* sleeping hotfix
* fixes simple mob resting
* V is the macro for resting
* projectiles no dodgy
* refines the projectile check
* god I hate strings
* MORE FIXES
* I hate buckling
* fixes capulettium plus
* winding down
* farie review
* bugs did stop showing up
* SEAN
* todo
* sean review
* ed209
* i HATE cyborgs
* steel review
* laaaaaast things
* reverts stun baton changes
* and done
* Switch a bunch of /obj/machinery from /New to /Initialize
This is an easy and uncontroversial batch.
No globs, no late init, and stuff.
* Move more machinery to Initialize
This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.
* More tricky New -> Initialize migrations
* The last of machinery Initialize conversion
* fixups
* Newscaster armor fix
* styling
* Comment on armor handling
* Move newscaster armor definition back to datum
* farie82 review
* kill extra .=
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* farie's review part 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Go fish
* Keep forgetting about the map
* Forgot about the sprites for the double deck
* Cleaned things up
* Fix icon conflict
* Update cards.dm
* Improper tweaks
* Update cards.dm
* Axing the popup from the toy version entirely, that was a little jank
* Meta remap was merged
* Huh. \improper was the issue.
* Update cards.dm
* Few changes and a fix
* More changes
* Update cards.dm
* Update cards.dm
* Update cards.dm
* Merge branch 'master' into go-fish
* Update cards.dm
* Initial defines
* more work
* icon
* more stuff
* UID not hard ref
* tidying
* overload go brrt
* le sound and dead cell
* delet gap
* initial chargepack stuff
* simplify
* oops
* yeet this
* placeholder sprites
* oops magic number
* the gun speaks!
* consolidation
* tweaking and tidying
* so long old gun
* icon purge
* reapplies placeholder
* 1 minute tracker, not two
* makes it use a pinpointer
* revert tiny map changes
* cease your tracking, fool
* oops
* soft refs
* charlie review
* projectile ref to firing obj, removes testing overrides
& cleans up signals
* some more UID null checks
* ICONS
* ICONS CONFLICT
* MORE ICONS
* makes it freaking work
* first pass fixes
* charlie review
* charlie review 2, variable boogaloo
* fixes holsters
* colours the overcharged shot
* and recolours tracker to be yellow to match charge
* yellow laser icon
* widen overcharge misfire %
* fixes unlinkable pinpointers
* fixes gun not speaking when tcomms setup is changed
* steel request
* no chargey
* loudening 2022
* steel part 1
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* restores missing sprites
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
