* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
* Rework spray bottles and tools based on them somewhat.
Consolidate spray adjustment functions.
Change method of preventing spray amount adjustment.
Standardize most spray amounts at 10u/2 tiles and 5u/1 tile.
Should fix the following issues:
https://github.com/ParadiseSS13/Paradise/issues/29930https://github.com/ParadiseSS13/Paradise/issues/28964
* Adjust spray rework based on review comments
Change `adjustable` var to boolean
Change `adjust_verb` to `adjust_action`
Tie spray transfer amount to tile reach
* looks good to me
* replaces mentions of humans
* Revert "looks good to me", as Trinary is not being replaced
This reverts commit 275aca6adb.
* removes a duplicated bot init
* wooooo
* fixes tgui stuff
* adds sql
* initial
* i'll get fired
* update icons for mapping as well
* update maps
* tweak
* tweak and revert a bit
* tabs
* speak english, motherfucker
* oh
* updatepaths
* first commit
* gold
* updates item icon because i am dumb and forgot
* updates armour vals
* helmet too
---------
Co-authored-by: Bmon <no@email.com>
* Nct ID
* Preferences, job creation, access and other stuff
* Sprites, defines, hidden job pref and other stuff!
* Missed a comma
* Sprites updated, clothing code, outfit and id
* Fix a small oops
* Data chip + Sechud icon
* Offstation, access, datachip code, ticket autoresponse and a lot of other stuff.
* Typo, spritesheet fixingg and icon color
* Telebaton removed, not allowed to scan ERT IDs, blacklisted some access
* Applies suggestion
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* Applying Suggestions!
* Forgot to increase the number of slots, oops
* Added a few items that I forgot, applying suggestions.
* Fix check fail?
* Mapping Tools/Icons.
* Office added to all maps, a few modifications to fit.
* Adds ACCESS_TRAINER to who needs it.
* Fixing check fails.
* NCT Beret obj are now where they're supposed to be
* Suggestion
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* Sprites fix + NCT flag
* Code Suggestion
* Sprite update
* Suggestions
* Diagoras Office, conflict fix.
* Day 1 fixes, suggestions.
* bundle rebuild
* Fixing a few issues.
* Mapping review + Suggestions
* Fixed check fail.
* Conflict fix + You shouldn't be able to insert the NCT chip into an id console
* Fix map conflicts
* Plasmaman icons and Kidan icon fix
* Conflict fix?
* A few changes following feedback.
* Small description changed, as per requested feedback.
* Suggestions/Fix
* Forgot some mapping issues
* Suggestions
* Fixed?
* Fix linters
* More fixes
* aaaaaaaaaaa
* Christa's reviews
* Naming stuff
---------
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* 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.
* refactor: Rename all non-snake_case types (not procs or vars (yet)).
* completely dynamic update script
* might help to include the data
* update aa's scuffed python
* oh
* set script PR number
* run updatepaths again
* Add other table updates with JSON columns
* bump SQL version
* just fucking end my life
* move JSON data
* 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>
* ebent
* WHYYY
* bobobo
* adds ton of epic stuff
* messages added
* Outfit!
* Indentation! Arrhghg
* Gamemode checks, antag check stuff and outfit changes and tourist icon
* ID icon, random species, gender, hair, a few comments and logs.
* Mirroring review
* Applies suggestion
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* Tourist Id's now have linked accounts, code cleaning as per reviews
* Following suggestion
* Apply suggestions as per review
* Addresses the risk of two people having the same account
* Typos and final cleaning
* Checking for jobban/Not showing as tourist on manifest
* Orbit test
* compile
* ebent
* WHYYY
* bobobo
* adds ton of epic stuff
* messages added
* Outfit!
* Indentation! Arrhghg
* Gamemode checks, antag check stuff and outfit changes and tourist icon
* ID icon, random species, gender, hair, a few comments and logs.
* Mirroring review
* Tourist Id's now have linked accounts, code cleaning as per reviews
* Applies suggestion
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
* Following suggestion
* Apply suggestions as per review
* Addresses the risk of two people having the same account
* Typos and final cleaning
* Checking for jobban/Not showing as tourist on manifest
* Orbit test
* TGUI Bundle Rebuild
* Applies suggestions
---------
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Diverse Traders Types
* Trader Type control, announcements, species spawning
* Trader Outfits
* Posh Moth - Posh Cane
* Landmarks, Trader ID Name Change
* Trader Shuttle Adjustment - Landmarks for Item Pools
* Outfit Survival Kit changes
* Added another refill for the hand labeler due to more cargo
* Trader Shuttle locker fix
* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle
* Mech access, No double mechs, Small box fix
* Removed Solgov Gunkit from General Pool
* Spacing
* Moved traders to not be event subtypes, added documentation to vars
* Boxed spacing, removed improper
* Moved postequip, used box variables
* Lore team requested change - Bolt action instead of AK
* Changed landmark
* Moved soviet ammo to minor gear, increased soviet minor gear to 8.
* Obfuscated Cybersun
* Lootpool Adjustments
* Readded Solgov Kit to general pool at low weight
* Commas!
* Spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Re-Nulled After_Equip_Job
* Removed extraneous var spaces
* Relocated space in trader introduction message
* Robomoon is now once again Cybersun
* Impropered Enforcer Kit
* No more ERT box for non-NT boxes
* Fixed turbine kit stock part amount
* Subtyped skrell/unathi suit boxes
* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons
* Reduced weight on arm/esword implant rare items
* Also reduced arm laser weight
* Added a couple items to skipjack large - more 'random', filled in reduced weights
* Path typo fix
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb6.
* More changes that compile and work
* IT WORKS AAAAAA
* Changes even more .len to length()
* Apply suggestions from code review
* Update code/datums/mind.dm
* Update code/__HELPERS/sorts/InsertSort.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
