* Refactor /mob/unEquip.
* fix things found in testing
* more fixes from testing
* fix removal of hooded suits
* fix flayers inability to deploy swarmprod
* fix changeling blade activation
* unnecessary parens
* pass default unequip args to proc overrides
* fix belts being able to forceMove into full hands
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* adds antaghud icon
* TGUI bundle build dont push changes i didnt stage challenge 2025 (IMPOSSIBLE)
* Adds organ repair passive
* Description fix
* Runs prettier
* Fixes desc 2
* Fix revert
* Remove vamp text
* Fix some CI + Partial refactor
* Fixes CI
* Fixes gamemodes I messed with
* Moves these procs over
* Description fix again
* Add back limit requiring drainees to have ckeys
* Adds terminator icon
* Update code/datums/status_effects/buffs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/surgery/organs/augments_internal.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* More lewv review
* Clamps the EMP severity
* Fixes "surveilance" typos
* The TODO is gone and can't hurt me anymore
* Update code/modules/antagonists/mind_flayer/flayer_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/game/objects/items/weapons/pneumaticCannon.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/game/objects/items/weapons/stunbaton.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* More lewc reviews
* Update code/modules/antagonists/_common/antag_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/_common/antag_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_datum.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_power.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Fixes some camera bug issues + lewc reviews
* Update code/modules/antagonists/mind_flayer/powers/flayer_passives.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/flayer_power.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Updates a comment and fixes whitespace
* Autodocs flayerprod
* Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* qdel things we dont need anymore + typing an argument of add_abillity
* Remove debug log
* Update code/modules/antagonists/mind_flayer/flayer_power.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* Slightly buffs, and fixes GC issues of tether
* I no longer feel i am a mindflayer
* Fixes formatting of greeting
* Better greeting
* Worlds shittiest sprite
* Don't need this TODO anymore
* Fixes double description
* Changes the wording on the borg laws
* and bundle too
* The cannon uses shrapnel now
* Initial style changes
* Ratios for brain damage
* Adds a chemical to test for flayerism
* Fixes the brain damage ratios
* Abilities are purchasable again
* Updates TGUI properly
* im sorry linter
* Steam smoke
* Hi bundle
* Re-abstracts this proc post syndi orgs
* Fixes gamemode logic post cling round removal
* I WONT FORGET IT THIS TIME
* Fix name of steam ability
* I'm a fool
* Fixes processed passives + removes debug message
* Fixes updating abilities inside UI
* Better description for quicksilver form
* First part lewc review
* Remove debug thingy
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Fixes defines + GCs weapon spells
* We don't need this
* Eyes GC properly
* Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* adds better logging to the assimilate
* Adds parenthesis
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
* TGUI Bundle Rebuild
* Fixes and Reworks TGUI
* Cleaner JS and Fixes
* adds anti-snitching clause to borg laws
* changes the span for the borg messages
* No holoparasites
* Puts baton silence in line with glare
* Fixes total_swarms_gathered
* Nuke old trait
* Gun no longer not stuck
* Rejuv clears delayed knockdown
* Some weapon ability fixes
* Makes radio enable timers not counterintuitive
* Fixes beepsky runtimes
* Makes naming more consistent
* Adds one-click-antag
* Adds the mind flayer toggle (doesn't technically work)
* Adds flayers to check_antagonist
* Gives IDs to the status effects
* Also this one
* Makes retracting work again if it's in your offhand
* Fixes pacification tech levels
* Grapple is a weapon ability now, nullifcation retracts implants
* Fixed descriptions
* Adds some pizzaz to torque enhancer
* This actually needs to be like this
* Moves a helper proc over to a helper proc file
* Extra admin visibility
* Nukes the wacky flayer mob
* Makes silicon administrative access more sane
* Terminator form better description
* Makes rejuv set stamina to 0
* Various price increases
* AAAAAAAAAAAAA
* Better feedback + logging on cyborg subversion
* Swarm purchase display (temp fix)
* Makes mindflayer sounds more silent
* UI improvements
* Various mindflayer fixes
* Typo
* More fixes
* Fixes innates from being stupid
* Forgot to add this check earlier
* Oh this is how you add things to the protolathe
* Changes some description and upgrade messages
* Allows you to drain people beyond your limit
* Fixes some weapon upgrade issues
* Fix CI
* Fixes some draining issues
* More UI Tweaks and QoL
* Fixes most of the issues
* text
* Fixes
* Adds a radio jamming option to intruder
* Gives obfusciation to jammer ability
* Small passive cleanup
* Fixes Search and Adds Ability Stages to UI
* Adds freebie abilities
* Restructuring chain and adding blackbox
* Tgui polish
* Small fix for traceroute
* Fixes one click antag
* Increases EMP resistance cost
* Changes the pneumatic cannon into a shotgun
* Slightly lower static
* Fixed innate building rendering in upgrades
* Fixes icon and description
* Consistency
* Punctuation fix.
* Quick reboot + terminator form synergy
* Adds safety deleting
* Fix level for torque
* Fixes a bad bug
* Update code/game/gamemodes/objective.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Aaaaaaaaaaa
* Makes torque a martial art and some martial arts safeties
* Replaces vortex arm with barrier
* Fix paths
* Adds torque knockdown
* Part 1 lewc review
* HIIIII SQUIDWARD I'M IN YOUR BRANCH NOW
* Removes flak cannon
* Flayer respects mindshielding now on vamp+cling
* Fixes EMP resist
* More fixes
* DGL review
* Contra review
* Clean up weapon powers
* Various tweaks
* Borg hand slight improvements
* Parent call needs to be after this
* Fixes stuff
* Adds a new proc that is called when a spell is purchased
* NEW SPRITES WOOOO
* Traceroute update
* Slightly lower traceroute cost
* Formatting
* Oops
* Wow this could've been bad
* Overclock small buff
* Reduces cost of 1st level EMP immunity
* Lewc review
* TGUI Bundle Rebuild
* Fix barricades
* Lewc review
* Okay FINE qwerty I'll change this
* Traceroute thingy
* I am an idiot
* First part
* Lewc review
* Forgor this one
* Last bits
* Update code/game/objects/items/control_wand.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Null
* Static-ness
* Update code/game/gamemodes/changeling/traitor_chan.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/__DEFINES/mindflayer_defines.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Last bits
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
* 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
Kyani