60 Commits

Author SHA1 Message Date
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
Timothy Teakettle 0a29f26eba fixes issue with the blood cap 2022-06-16 15:51:46 +01:00
Timothy Teakettle d1ba124743 blood cap 2022-06-16 15:47:04 +01:00
Timothy Teakettle 0a61bb3813 forgot to push some final changes 2022-06-16 15:37:04 +01:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
DeltaFire 05f7991981 snap 2021-01-09 20:37:24 +01:00
DeltaFire 566d74bd77 E 2020-11-26 16:12:08 +01:00
DeltaFire ed08983b97 syscorruption framework
Adds a framework for systems corruption instead of toxins damage for use in synthetic species. No ways to deal / heal it yet, nor effects, or actual uses. Soon.
2020-11-01 04:56:31 +01:00
DeltaFire 4146566af0 hoo boy
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
timothyteakettle e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
Ghommie ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
Ghommie e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Arturlang ada31990d0 Fixes prosthetic causing bloodsuckers to bug out (#12136)
* Fixes prosthetic causing bloodsuckers to bug out

* Moved it per ghommies suggestions
2020-05-14 13:44:48 +02:00
kevinz000 9d753fe74f Update damage_procs.dm 2020-04-30 01:07:10 -07:00
Ghommie a726f09201 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-04 03:54:52 +01:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000 9292ff1972 Update damage_procs.dm 2020-01-26 13:27:54 -07:00
kevinz000 102252fb02 Undocumented change: toxloss blood penalty nerf. Sorry, love you slimefolks but put this back in another PR if you want. 2020-01-24 21:48:04 -07:00
Putnam d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Artur 90113838a7 Iconfix and co
Traits instead of procs for fakedeath

Quickfix

Whoops this too

Loadsa fixes

Nerfs stamina regen

Too slow

Hm
2019-12-02 19:48:02 +02:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
kevinz000 ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
Fermi bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
Ghommie 358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00
kevinz000 bd9443252a Merge pull request #9579 from YakumoChen/shapeshift
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
2019-10-24 19:13:54 -07:00
YakumoChen 3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen 3d63e9aa20 throwing darts at the wall here 2019-10-23 00:50:05 +00:00
YakumoChen e76f64ce16 #43784 2019-10-22 23:49:29 +00:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Fermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Fermi c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa fd16520ac0 buffs toxinlover blood deletion penalty 2019-08-27 02:42:45 -05:00
Ghommie 0e630680ba forgot to pull from upstream. One second. 2019-06-06 15:20:27 +02:00
deathride58 c56cf7885d lets try fixing the fucking stamina bug - removes redundant update_stamina() calls and moves update_stamina() calls outside of if clauses 2018-11-29 12:35:01 -05:00
deathride58 d7bca1922d Mostly fixes stamina by making knockdown() apply its staminaloss to the chest, giving adjuststaminaloss() new args, disabling limb-specific stamina regen for the chest, and disabling head stamina (#7596)
* fixes stamina (hopefully)

* makes adjuststaminaloss() apply to the chest by default, makes it possible to target specific zones with adjuststaminaloss.

* i dropped out of first grade dont bulli

* REE

* be patient im a dum

* come on
2018-10-03 20:44:09 -07:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 3352a1b839 Fix 2018-08-23 17:04:36 -07:00
Jordan Brown 453bd38ca5 Merge pull request #37516 from XDTM/LinearBrainDamage
Changes the trauma formula so constant small ticks don't keep triggering traumas
2018-05-01 09:56:39 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* 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
2018-04-07 23:07:09 -04:00
deathride58 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
CitadelStationBot 6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710)
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
2018-03-05 12:34:01 -06:00
XDTM bd6e8f0bbb Adds limitations to brain traumas (#35938)
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
2018-02-25 11:01:15 -06:00
deathride58 b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
XDTM 962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00