* 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>
* Changes necrosis_prob to use decaylevel.
* Reverts previous change to create a new branch.
* Reverts (https://github.com/ParadiseSS13/Paradise/pull/24667)
* Does not revert the previous PR, it builds upon it. Allowing items on the belt slot with the "special" var set to TRUE to overlay suits.
Judo Belt, Webbings, and Bandolier are the current selection.
* Fully fleshes out the layering of special belts.
* Adds more belts to the special layer.
* Fixes an oversight with the captain's rapier being left out. 😭
* Fixes a few more oversights caused by a pull/fetch.
* Moves around an if statement to fix the order of operations, which was causing items that should've been OVER the suit item to be appear UNDER it.
* Should resolve the merge conflict.
* Partial revert
* Merge conflict resolution
* Refactors how a 'special belt' is defined and handled. Makes it more readable.
* renames all instances of `special` to `layer_over_suit`
* initial commit (broken)
* load the html
* fix this
* Fix various issues with browser statpanel
* Fix Alt Clicking opening up a window and Add back some object verbs to the browser stat panel
* Optimize stat panel and fix guardian verbs
* Restyles Stat Panel, Adds Subpanel Sub-Categories
* Use better layout for verbs in stat panel
* Updates statpanel verb widths to be more dynamic at higher screen resolutions.
* Adjust stat panel grid item widths and breakpoints
* refactors statpanel to use tgui API
* CI moment
* more CI
* this stupid thing
* Apply suggestions from code review
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Update code/modules/client/client_procs.dm
* ci fix
* emergency mc debug view
* temp revert some code change suggestions due to massive runtiming
* proper atom click topic implementation
* optimise
* mob clicking in stat panels work
* yeet spell tab thingy
* yeet simple stat panel pref
* allow insertion of html into MC tab content
* tidy up status tab
* Apply suggestions from code review
* fix this
* fix CI
* oops
* fix index runtime
* fixes MC tab showing up for mentors, fixes runtime
* safeties!
* Return of theme support
* more fixes
* fix view range pref, tidy prefs tab
* Remove old stat panel from themes
* fixes
* make sure verbs don't go missing
* fix ooc/looc breaking
* Revert "make sure verbs don't go missing"
This reverts commit 7d07ad45ed.
* fix this properly
* fix stat panel hitting rate limiters
* fix borg status tab
* Object Window Niceties
* Adds file cycling for icon2base64
* optimizes icon2html() for icon files known to be in the rsc at compile time
* CI moment
* remove dupe emergency shuttle timers
* more robust verb updates
* statpanel tweaks
* zip archived changelog to avoid search results
* optimise
* fix mentor chat wonkyness when disabled
* debug log moment
* i am very smart
* reintroduce this because it was needed
* better time listings
* less jank
* stops telling admins they arent mentors
* returns MC tab pref for admins
* Update code/controllers/subsystem/SSstatpanel.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lewcc
* OD typemaker prep
---------
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* 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
* Martial arts no longer persist through cloning
* Remove unnessecary var declarations
* Combo counter
---------
Co-authored-by: Adrer <adrermail@gmail.com>
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
* biting off more than I can chew, but I feel like hurting myself
* more shit
* progress continues, moral stays sameish
* bite of 2587
* mod_theme down, but probably broken
* 385 errors, 16 warnings, zero tgui interactions
* 292 19
* final strech to buggy mess, break time
* it compiles. It almost fucking certainly doesnt work, but it compiles
* fudhsciffubgsbgpgb actions not working as should for modules
* fuck it we'll just open the pr as we work on it
* icons work now
* tgui stuff
* more progress
* JUDGEMENT
* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.
* jetpacks, gps, and go do what exo-suits yourself
* almost ready
* sorry to whoever has to review this
* should work™️
* should be good now
* pushing changes so I can do reviews next
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* lore™️ Adds illegals level to modsuit parts from syndicate.
* early returns
* and these illegals
* no uplink reference idiot
* mod inhands are a good idea
* this is needed for inhands nerd
* Bomb detector working, modsutis cover ears. skin things
* overslotting removal, cyborg charging, ert loadout for gamma
* duplicated signal
* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.
* tether module, orb module, holster stuff
* built in no slip, cheaper 87
* removes modules already installed, engineer ert get jetpack, equip into modsuit storage
* comments spaces and duplicate flags
* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Compile TGUI, slowdown adjustment, Modsuit to MODsuit
* sonar, do after, more equipment, acid handling
* overlay bugs / ERT / DS suits autodeploy
* middle click action buttons
* traders, sec modsuit energy nerf
* surplus weighting
* Kinesis module.
* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis
* more power / unused module removed
* name, ds fix, pre equipped to cc suit
* depot / grammer
* ok should be good™️
* overslot, dupe gun, missing suit storage
* stealth nerf, new kit
* gun stuff / ds theme
* bio armor is gone
* let me push changes please thank you
* makes shocks work right
* copies over some changes TG made to module prices after porting
* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-
* sirryans changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Control define, ERT / DS have gloves / boots again.
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* More changes
* god I hate tgui. Why do all the bundles live underground, instead of in my basement?
* she updates my master till I testmerge
* modsuits can recharge again
* fixes a lot of shit
* Ready for TM probably
* sure fuck it whatever that makes sense I guess
* the pinpointer works better™️
* Another storage module bug fix
* hair and medical stuff
* fuck fuck fuck
* fixes sonar
* Bag exploit fixes / plasma runtimes / ear nerf
* dna lock improvement / cryostorage
* whoops
* Ball form second cooldown wasn't helping, no more infinite cores
* she springs my lock till I ***SNAP***
* plasmaman no longer die
* fixes modsuit emp issues
* atmos no longer fucking dies
* Fixes, module printing, and a restriction on newly constructed modsuits
* Inventory code my hated
* WOOO PREFERENCE CODE WOOOOO
* icons my hated
* fix for mods / spaceproof shit
* holy shit whhhyyyyy
* backpack first
* Update mod_theme.dm
* prevent infinite gun arms / infinite modsuit cores / syndicate modules
* fixes tm error
* scream loudly if species sprites break. They shouldn't, but, you know.
* deconflicted with luck
* converts to refit for species
* fix pathfinder
* fixes modsuits being funky power wise
* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit
* nerfs the atmos modsuit
* magboots for ds / CC modsuit
* downside of autosave: typing in wrong window saves bad stuff
* Gamma ERT have internal cameras again.
* spellcheck when
* ah fuck
* yes delete the null that works
* whoops
* fixes error / description
* un vulps your cannon
* fixes tails disapeering on base modsuits
* space to underscore
* tgui fix / tajaran
* springlock buff, cryopod fix
* u helps
* WHO PUTS A GUN IN ITEMS
* tgui moment
* mining modsuit nerf / hidden holster module
* PAIN
* UNATHI TIDE STATION WIDE
* I love special code
* slightly dense
* shark jumpscare
* fixes ghost item, fixes springlock being bad
* YIPPEEEE IT WORKED
* she decons my flict
* pain
* ebbas days are numbered :^)
* hidden
* r-r-r-ebuild
* fixes more bugs
* qwerty, you are dense
* fixes gps
* fix mulebot crate
* level fix
* adds back icon
* moving storage, fix bug, modules activate / deactivate message
* yeah
* yeah
* yeah™️
* steels requests
* windoors no longer make pathfinder module explode
* chat spam
* oil slicks + modsuits
* whoops
* bag check
* ofc
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/uplink_items/uplink_nuclear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/modules/module_pathfinder.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* martial arts have a weight system now
* remove unneeded variable
* carp cannot be deactivated once learned
* i love documentingtation
* krav can no longer delete other combos
* now ill be embarassed if i dont make it better
* i know how istype works i promise
* implement sirryan's changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* heh, almost made me use ten percent of my power
* appeasing the GC gods (GDN)
* hee hoo
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/objects/items/hand_item.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* more return styling
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* no more wrapper
* the extent of my spriting skills
* fixes double slap sound
* slap emote also works
* try to remember the advanced lessons of CQC
* i hope this fixes the merge conflict
* Chefs are no longer perma-combat trained
* Chef CQC now uses signals to activate parrying
* Makes it easier to add it to other martial arts
* resolving merge conflict from ParadiseSS13#20620
* Revert "resolving merge conflict from ParadiseSS13#20620"
This reverts commit 30ea29a6a8.
* Revert "try to remember the advanced lessons of CQC"
This reverts commit e8daeb4d1a.
* try to not conflict the basics of CQC
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/modules/martial_arts/cqc.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* lol, lmao even
* GDN was right, this is funny
* Update code/modules/martial_arts/cqc.dm
farie review pt. 1
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/martial_arts/martial.dm
farie review pt. 2
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/human_emote.dm
farie review pt. 3
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@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
* 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
* it's finally here
unfucks tgui
* oops, I don't want to change the mode
* charlie and moxian review
* charlie review II + some GC fixes
* rebase to fix conflicts + tgui bundle deconflict
* charlie review III + affected review
* final? tweaks
