* t checkout master
Revert "Fixing fulton pack not working (#26153)"
This reverts commit 67353fd62a.
* Revert "Cult magic attacks and attacks on stun mark can now be blocked by shields (#25771)"
This reverts commit 9ea58e1e33.
* Revert "[s] Stunbaton no longer triggers shields twice (#26197)"
This reverts commit cd88b3de88.
* part 1
* these also
* fuckin nuke it
* more
* more stuff
* more crap
* wow
* holy fucking shit, it works
* thats a start
* oops
* fubing bundle
* hahah brrrrr
* I LITERALLY ADDED IT BACK, FUCK OFF GIT
* yeah more changes
* hide abstract
* blamo
* thats enough for today
* old code begone
* goodbye can_strip
* nearly there
* finally
* fuckin finally
* review
* tgui
* unbreak shit
* fix OD
* okay, that should fix the last thing
* remove hover on nodrop, fix early interacting
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
* stunbaton delayed knockdown now moved into status effect
* renaming proc to keep its meaning
* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED
* cleanup, little bug fixing
* cleanup
* whoopsie
* updates
* signal string changed
* Update code/datums/status_effects/neutral.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
---------
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* Changes most instances of brute to stamina, combos
* Adds CQC back into uplink
* Updates chokeholds so it takes time to knock out
* Adds cqc back to tot uplink, gives nukies discount
* Tweaks base grabs and disarms
* Tweaks combos some
* I am a mild idiot
* Charlie's suggestions
* I don't like these numbers, nerf head kick
* Removes blocking and countering
* More kicking tweaks
* Update code/datums/uplink_item.dm
commit charlie's changes pt. 2
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* stop kicking yourself
Co-authored-by: Charlie <69320440+hal9000PR@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
* 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
* robot_module refactor
* some fixes
1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`
* review tweaks + other stuff
1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items
* fixes after upstream merge
* blank line for travis
* fixes and improvements
1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes
* more fixes + constructable frame runtime fix
* removes toy sword placeholder
remove comment
* remove these as well
* .amount to .get_amount(), really should have done this before
* refactors robot_upgrades to work with the new system
- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting
* moves some unemag logic to the module file, makes more loops typless
* farie review
* fox review
* affected review and more TM bugfixes
* fixes comment
Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
* 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
Qwertytoforty