Commit Graph
14728 Commits
Author SHA1 Message Date
CitadelStationBot addaeba21b Automatic changelog generation for PR #5463 [ci skip] 2018-03-11 15:32:46 -05:00
deathride58andkevinz000 1c0b13ecfb [READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)
* 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
2018-03-11 13:32:44 -07:00
LetterJayandGitHub b4f5279580 Update __donator.dm 2018-03-11 14:17:47 -05:00
LetterJayandGitHub 1e7c6daeaf Update custom_items.dm 2018-03-11 14:17:18 -05:00
LetterJayandGitHub 3266d18493 Update __donator.dm 2018-03-11 13:34:25 -05:00
LetterJayandGitHub 15d9d9e174 Merge pull request #5903 from Citadel-Station-13/donator
adds two donator items
2018-03-11 08:53:27 -05:00
LetterJay 1f3c9fca30 adds two donator items 2018-03-11 07:22:46 -05:00
CitadelStationBot 9f72d1f6e5 Automatic changelog generation for PR #5900 [ci skip] 2018-03-10 23:09:17 -06:00
CitadelStationBotandPoojawa 18ace46af8 [MIRROR] Improves the shuttle error to include jump links and destination (#5900)
* Improves the shuttle error to include jump links and destination (#36305)

* Improves the shuttle error to include jump links and destination
2018-03-10 23:09:15 -06:00
CitadelStationBotandPoojawa 41612ee1f6 [MIRROR] Fixes Delta atmos maint access (#5897)
* Fixes Delta atmos maint access (#36291)

* Fixes Delta atmos maint access
2018-03-10 23:08:41 -06:00
CitadelStationBot 9236e7959f Automatic changelog generation for PR #5895 [ci skip] 2018-03-10 23:08:17 -06:00
CitadelStationBotandPoojawa 21bd33233b [MIRROR] Delta: Adds wall safes to HoP/Cap offices (#5895)
* Delta: Adds wall safes to HoP/Cap offices (#36281)

* fixes atmos emergency exit area, adds wall safes

* reverts atmos maint area

* Delta: Adds wall safes to HoP/Cap offices
2018-03-10 23:08:15 -06:00
CitadelStationBot 2e2ca8eb6d Automatic changelog generation for PR #5899 [ci skip] 2018-03-10 15:35:56 -06:00
deathride58andGitHub fc5870f699 Merge pull request #5899 from Citadel-Station-13/upstream-merge-36285
[MIRROR] Holy water is trivial against Eminence once Daddy arrives
2018-03-10 21:35:54 +00:00
CitadelStationBot 17500dc2f2 Automatic changelog generation for PR #5896 [ci skip] 2018-03-10 15:35:32 -06:00
deathride58andGitHub 0d0841eafa Merge pull request #5896 from Citadel-Station-13/upstream-merge-36255
[MIRROR] Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns
2018-03-10 21:35:30 +00:00
deathride58andGitHub b60b1c7aa8 Merge pull request #5898 from Citadel-Station-13/upstream-merge-36286
[MIRROR] [s] Fix config loading exploit
2018-03-10 21:34:34 +00:00
CitadelStationBot 1e0df81e63 Holy water is trivial against Eminence once Daddy arrives 2018-03-10 14:53:30 -06:00
ExcessiveUseOfCobblestoneandCitadelStationBot 236effbc5b Holy water is trivial against Eminence once Daddy arrives (#36285)
* Update _eminence.dm

* cleanup daddio

* Xhuis if I see another spaced if...
2018-03-10 14:53:30 -06:00
CitadelStationBot 257b03b79f [s] Fix config loading exploit 2018-03-10 14:52:18 -06:00
Jordan BrownandCitadelStationBot ad6a3e810f Fix config loading exploit (#36286) 2018-03-10 14:52:18 -06:00
CitadelStationBot 15af250d21 Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns 2018-03-10 14:37:36 -06:00
Ashe HiggsandCitadelStationBot ceea41b5fe Fixes slow circuit cloning breaking with some circuits, and makes it use world time checks instead of decrementing countdowns (#36255)
* Fixes slowcloning breaking with nonints

* Refactors to use timestamps and not seconds
2018-03-10 14:37:36 -06:00
CitadelStationBotandPoojawa aa7b9f192f [MIRROR] harmful var for guns (#5879)
* harmful var for guns (#36265)

* harmful var for guns

support for pacifism to use non-harmful guns

* fixes bad spacing

oops

* harmful var for guns
2018-03-10 07:57:57 -06:00
CitadelStationBot 4f4d486244 Automatic changelog generation for PR #5892 [ci skip] 2018-03-10 07:43:44 -06:00
CitadelStationBotandPoojawa e3831a684f [MIRROR] Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#5892)
* Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)

* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage

* Replaces alien brain necropolis chest loot with new artifact [MERGE READY]
2018-03-10 07:43:42 -06:00
CitadelStationBot 0f7171a5b4 Automatic changelog generation for PR #5891 [ci skip] 2018-03-10 07:43:17 -06:00
CitadelStationBotandPoojawa e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891)
* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables
2018-03-10 07:43:14 -06:00
CitadelStationBot 0ebb1be847 Automatic changelog generation for PR #5890 [ci skip] 2018-03-10 07:38:56 -06:00
CitadelStationBotandPoojawa 215ceaead3 [MIRROR] Adds welding goggles to engivend (#5890)
* Adds welding goggles to engivend (#36280)

* adds pill bottles/rcd/welding goggles

* atmosia is suffering

* Adds welding goggles to engivend
2018-03-10 07:38:54 -06:00
CitadelStationBotandPoojawa 93d8756a70 [MIRROR] NAMEOFs some things (#5877)
* NAMEOFs some things (#36263)

* NAMEOFs some things
2018-03-10 07:38:37 -06:00
CitadelStationBotandPoojawa 67e6c464c3 [MIRROR] Test merge candidate is removed on commit push (#5878)
* Test merge candidate is removed on commit push (#36266)

* Test merge candidate is removed on commit push
2018-03-10 07:38:19 -06:00
CitadelStationBot 303ccde640 Automatic changelog generation for PR #5880 [ci skip] 2018-03-10 07:38:00 -06:00
CitadelStationBotandPoojawa 2570cefb40 [MIRROR] Fixes shuttles breaking when the turf the mobile dock is on is removed (#5880)
* Fixes shuttles breaking when the turf the mobile dock is on is removed (#36261)

* Fixes shuttles breaking when the turf the mobile dock is on is removed
2018-03-10 07:37:58 -06:00
CitadelStationBot f4d3cfb0bd Automatic changelog generation for PR #5888 [ci skip] 2018-03-10 07:36:02 -06:00
CitadelStationBotandPoojawa 4e9cff854d [MIRROR] Turrets can be set to shoot people without loyalty implants (#5888)
* Turrets can be set to shoot people without loyalty implants (#36226)

* adds feature to turrets allowing them to be toggled to shoot people who have not been loyalty implanted

* Fixed mistake left when changing variable names

* Turrets can be set to shoot people without loyalty implants
2018-03-10 07:36:00 -06:00
CitadelStationBot ea8c1a0446 Automatic changelog generation for PR #5881 [ci skip] 2018-03-10 07:35:11 -06:00
CitadelStationBotandPoojawa b03917057b [MIRROR] Removes the smoke machine from roundstart chemistry (#5881)
* Unmaps the smoke machine (#36260)

* Removes the smoke machine from roundstart chemistry
2018-03-10 07:35:09 -06:00
CitadelStationBot dca0a1b2b9 Automatic changelog generation for PR #5889 [ci skip] 2018-03-10 07:34:30 -06:00
CitadelStationBotandPoojawa d97c2bc134 [MIRROR] Constructed turbines now properly connect_to_network() (#5889)
* Constructed turbines now properly connect_to_network() (#36222)

* Constructed turbines now properly connect_to_network()
2018-03-10 07:34:28 -06:00
CitadelStationBot fc612994e8 Automatic changelog generation for PR #5887 [ci skip] 2018-03-10 07:33:50 -06:00
CitadelStationBotandPoojawa 7b0570f394 [MIRROR] Fixes bodies responding to phobias (#5887)
* Fixes bodies responding to phobias (#36227)

* Fixes ghosts responding to phobias
When a ghost inhabiting their body hears a phobia word, they no longer
freak out.

* Modified to a guard clause

* Fixes bodies responding to phobias
2018-03-10 07:33:48 -06:00
CitadelStationBotandPoojawa 75160fb5b0 [MIRROR] Slightly optimizes adjust_clockwork_power (#5884)
* Slightly optimizes adjust_clockwork_power (#36250)

* optimizations

* Update power_helpers.dm

* Slightly optimizes adjust_clockwork_power
2018-03-10 07:33:22 -06:00
CitadelStationBotandPoojawa a999863e5c [MIRROR] Fixes mirror var desync (#5883)
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
2018-03-10 07:17:52 -06:00
CitadelStationBotandPoojawa 2aa4fef8e1 [MIRROR] Tidy Processor Overload event code (#5876)
* Tidy Processor Overload event code (#36277)

* Tidy Processor Overload event code
2018-03-10 07:17:25 -06:00
CitadelStationBotandPoojawa 4b550b40e8 [MIRROR] Fixes some traits runtimes that are being spammed (#5875)
* .len runtime fix (#36275)

* Fixes some traits runtimes that are being spammed
2018-03-10 07:12:55 -06:00
PoojawaandGitHub 9785222155 tweaks Tesla Point income (#5849)
* reigns in excessive point creep

* actually do math on this shit.
2018-03-10 07:12:24 -06:00
CitadelStationBot 18183c42b9 Automatic changelog generation for PR #5882 [ci skip] 2018-03-10 06:55:14 -06:00
CitadelStationBotandPoojawa b7e666ff23 [MIRROR] Fixes science scaling to decrease materials rather than increase.... (#5882)
* Fixes scaling displays (#36253)

* Fixes science scaling to decrease materials rather than increase....
2018-03-10 06:55:12 -06:00
CitadelStationBot bfaf737aaf Automatic changelog generation for PR #5872 [ci skip] 2018-03-09 16:10:25 -06:00