# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
* buncha things from upstream
* datums globals, onclick
* datums
* game folder, holy shit mirror bot why
* modules
* icons
* dme
* compiles cleanly
* tools purge
* updates maps
* double check just because. and wew lad
* incidentally, this needs more work first
* some things
* weh
* sound cleanup and icons
* reeeee
* compile issues
* oh look, fresh code sync
* cleans up some unused icons
* dirty vars
* reeeeeeeeeeeeeeee
* wew lad. fuck off with this already
* part 1 - resist out of resting, move and interact with the world while resting, and stamina regen nerf
* makes beepsky check for stuns instead of knockdowns, adds message for getting up, makes gravity reduce standup time, and more
* sprinting, staminacrit, balance changes, and more
* adds stamina modifier to clickdelay, makes items deal stamina damage to the user when attacking, buffs resting stamina regen
* combat mode, ability to toggle right-click context menu on/off, basic combat mode QOL, lays groundwork for 2-handing any item
combat mode toggle sound is from Interbay.
* commits dme changes
* unarmed combat stamina, ability to right click in combat mode, balance changes
* tosses in the HUD icons for later-ish
* rolls back admin.txt
* lotsa UI stuff
* stamina checks, some balance stuff
* adds support for best ui, adds right click to flush disposals, removes aggressive grab pinning in favor of neckgrab chokeholding
* quick dogborg patch while i figure out what do do with them
* oops - fixes prefbreaking for screenshake
* trying to sprint from an elevated surface onto lower ground will now knock you down
* right click to pull fire alarm, lets you bully people by pulling chairs out form under them, makes attacking objects cost stamina
* makes accidents during slipping less likely to occur while combat mode is active, makes tripping off elevated surfaces cause accidents
* makes pumping shotguns cost a tiiiny bit of stamina
* makes eyestabbing and batoning cost stamina
* makes failing stamina checks error out properly, adds stamina check to shotgun pumping
* adds stamina check for chair pulling
* readds aggressive grab pinning
* fixes bug with being buckled preventing interaction
* adds recoveringstam check to incapacitated
* reduces stamina cost for attacking
* oh this too
* fixes bug where you can get stuck in recoveringstam if your stamina suddenly becomes 0 while you're in staminacrit
* makes monkey transformation inherit staminaloss
* adds the ability to wave or shake your fist at someone via right click
* grammar and span closing
* 99 annoying little bugs on the wall, 99 annoying little bugs. take one down, pass it around, 864 gamebreaking bugs on the wall
* more distant right-click emotes.
* buffs standing stamina regen a tiiiiiiny bit
* adds aiming down sights for guns, makes firing guns cause trace amounts of staminaloss
* crusher powercreep - gives crushers the ability to heal staminaloss
* item throwing buff
* adds 1:1 HUD layout
* hopefully fixes issue with recoveringstamcrit not updating
* giant hipfire nerf
* halves the effect of staminaloss on movement speed
* makes stamina recover faster in staminacrit, makes it easier to get disarmed out of combat mode
* get_weight(), movedelay health_deficiency tweaking, combat and resting checks for item attacking
* makes staminacrit automatically disable combat mode, it's now impossible to enter combat mode while in stamcrit
* adds stamina buffer, halves the time needed to stand up after resting, increases stam penalty for firing weapons, and more
* tweaks stamina buffer drain rate a little
* makes buffered staminaloss redirect stamina to the actual stamloss proc when empty, makes stamina buffer stat() more precise
* removes stamina modifier for clickdelays, makes stunbatons deal extra staminaloss
* makes electrodes deal a lil extra staminaloss
* drones cannot resist a rest, so now only carbons are forced to rest
* restricts aiming down sights to carbon mobs, adds stamina display to stat()
* makes gun accuracy and stamcosts more flexible, decreases base inaccuracy penalty, makes borgs immune to inaccuracy penalties
* nerfs inaccuracy penalties just a lil more, fixes blooddrunk miner eye depleting all your stamina
* getting used to tortoisegit
* readds temp dogborg buff
* stamina and stamina buffer HUD displays. Stamina sprite from hippiestation
* makes afterattack call properly again
* decreases stamina buffer regen time to 3 seconds
* Yknow what? decreases it to 2 seconds. That's 3 entire attacks worth of waiting
* makes stamina buffer influence movespeed a lil
* nerfs compiling errors
* tweaks the icons a little
* adds autostanding, adds delimiters to attempts to stand
* makes automatic standup attempts a little clearer
* rest button now toggles intent to rest, fixes perma rest
* oop - quick fixes
* Makes crushers ignore recoil stamina on lavaland, makes burstfiring weapons deal less staminaloss
* buffs highlander sword
* makes stamina have less of an impact on the health display
* fixes dogborgs shoving other borgs into infinite stuns
* You can no longer shoot over tables or shoot through windows while resting. Also buffs turrets
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
* Fixes suppressing in pocked and w_class issues
* Used defines for some things
* Reworded
* Removed the now redundant initial_w_class var
* Early returns
* Null
* Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that
Adds a tip to examine for L6 SAW machinegun
* Adds a tip to examine for L6 SAW machinegun
* Fix syndicate toy C20r and L6 Saw not having riot darts (#30645)
* Add riot darts back into toy C20r and L6 Saw
Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.
* Comments are good
Especially when inheritance makes everything weird.
* Fix syndicate toy C20r and L6 Saw not having riot darts
