* added Russian Nians
* adds a new space ruin Voidhopper of Nexus aka freighter
* forgot a quotation mark
* Convert maps to TGM
new : _maps/map_files/RandomRuins/SpaceRuins/freighter.dmm
new : code/modules/unit_tests/atmos/test_ventcrawl.dmm
Automatically commited by: tools\mapmerge2\fixup.py
* fixed file format of the ruin
* renamed Russian Nians to Soviet Nians
* see above
* down with russian nians, long live soviet nians
* added a ruin paper per Warriorstar's request
* the name russiannian just will not be fully replaced
* forgetting commas and adding a new subtype of paper for the shipping manifest
* I think using quotation marks is causing me issues
* further removal of the term "russian" in preperation of a PR removing lots of referrals to russia
* added some new Poly voice lines
* accidentally commited the wrong PR...
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* made the shipping manifest ticked
* worked on the perspective of some stairs
* made changes requested by warriorstar
* changed formatting of the sovietnian's loot
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* forgot to add a new line
* i think this is causing the tests to fail perchance
* purging the term russian to be in line with a recent PR doing the same
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* fixed sovietnian to snake_case
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* i may forget snake case exists
* second time's the charm like a snake's two fangs
* added warriorstar's suggestions
* reverted a file that was accidentally converted
* fixed merge issues
* added an extra line
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
* Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
---------
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Janitor Rover
Adds the janitorial version of the Rover cyborg skin.
* Typo Fix
Jani rover formatting fix
* No-Hat
Currently the code doesn't support different hat offsets for directionals.
* Pink-to-Purple
Changed to a purpler color to better match other janitorial items.
* Deconflict
* Deconflict Again
* Rover Cyborg
Adding a new cyborg skin, 'rover'.
* No-Hat
The hat won't fit on its head without changes to how hat wearing works.
* Rename to Rover-Engi
To make way for other department module names.
* 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>
* AI can no longer toggle floorbolts while dead.
* Added a to_chat
* Switch to the check_unable proc.
* No need for the double to_chat
* Actually nevermind
---------
Co-authored-by: Adrer <adrermail@gmail.com>
* Revert "fixes this bloody laser (#27167)"
This reverts commit 1bec4cd8a7.
* Revert "Ports the Power Transmission Laser (#26928)"
This reverts commit 592b7c3ec3.
* this lol
* TGUI
* wip
* some formatting and copying over UI
* it compiles now
* oops
* Moves WATT_TICK_TO_JOULE to the power defines file. fixes UI
* spelling and announcement fixes
* Handle offsets for different directions
* laser comes from the correct tile now
* Added north and south sprites for the laser
* Adjust offsets for north and south sprites
* finished all north and south sprites
* tgui rebuild. Also sprites and code begoon
* Rebuild TGUI
* put PTLs in maps
* Repositions PTL room door in cyberiad
* fix if spacing
* undef and unundeffed define
* Removed overlapping stuff in some maps
* Actually makes the changes to metastation
* Fixes more mapping stuff
* Fix more unit test failures
* unmirror multitile component grid
* Fixes multitile
* explosions no longer make a hole in the beam
* This should fix it
* Stray pipe begone!
* Ok I think I fiigured it out
* Rebuild Tgui
* removes redundant removals of components parts and a redundant check. various style fixes
* Adds blocking to the beam and objects other than living beings take damage now.
* not using kwargs now. should work.
* Style changes and fixes some mobs getting hit by the laser that shouldn't be.
* Review changes and fixes trying to access wall turf's location.
* allow the new wall turf to form to we can properly access it.
* Moves the ptl beam effect to an atom proc that is overriden by the different types of things that can end up in the beam.
* Fixes some comments, adds clarifications, removes redundant usage of src
* moves the announcement threshold to a global var. Fixes ghost interaction.
* Revert "moves the announcement threshold to a global var. Fixes ghost interaction."
This reverts commit 7916ee76a1.
* Makes announcement threshold a static variable of the PTL
* power safty check on the mob ptl function
* Rebuild TGUI
