* 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>
* recipe paths
* splits frozen deserts
* d320b129f8 Merge branch 'master' into cavitytime
* agony
* woe, food upon ye
* edit
* unhecks the .dme
* unduplicates ur grape tart
* da camel
* whoops
* give bungo a tang
* da review
* review 2, electric boogaloo
* yogurt
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Mitchs98 <mitchs98@gmail.com>
* yogurt, but for real this time.
---------
Signed-off-by: Mitchs98 <mitchs98@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* stops heal_on_apply reagents from working when ingested and below 1u volume
* makes the source reagent container not get permanently flagged by data var. updates cryoxadone to use same implementation. makes tirizene not override a list with the number 13.
