SandPoot
07fe9bdbca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-14 15:09:35 -03:00
silicons and GitHub
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
SandPoot
2c4fcaba81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-06 15:04:36 -03:00
DeltaFire
97eb42b35b
defib policy hook & oxyheal
2021-10-04 15:49:12 +02:00
DeltaFire
7752e0d624
synthtissue and sr
2021-09-22 22:30:43 +02:00
SandPoot
dfe4a91219
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-08-11 13:06:19 -03:00
Artur
5acd7fef2d
makes salglu not deadly
2021-08-02 21:54:47 +03:00
Artur
2adfbea215
Merge remote-tracking branch 'origin/master' into fake_blood
2021-07-23 18:50:09 +03:00
SandPoot
8b45f2affd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-22 22:10:50 -03:00
DeltaFire
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
SandPoot
c48360be5c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-19 10:20:49 -03:00
Artur
5619b73e6b
Makes it actually, actually work
2021-06-16 02:02:28 +03:00
Artur
ad0c3d477e
Makes it work proper, hopefully
2021-06-16 01:48:54 +03:00
Artur
795ab3f835
https://github.com/tgstation/tgstation/pull/49798
2021-06-16 01:32:24 +03:00
Artur
096e7d4d67
https://github.com/tgstation/tgstation/pull/49927
2021-06-16 01:31:53 +03:00
Artur
fbcd1a3026
https://github.com/tgstation/tgstation/pull/55883
...
With a minor tweak so humans don't benefit
2021-06-16 01:26:02 +03:00
Artur
ab82766757
https://github.com/tgstation/tgstation/pull/59169
2021-06-16 01:19:48 +03:00
Artur
f3e16b298b
https://github.com/tgstation/tgstation/pull/56588
2021-06-16 01:15:21 +03:00
Artur
b0d7482f04
https://github.com/tgstation/tgstation/pull/55902
2021-06-16 01:09:30 +03:00
Artur
e2eb9d52d0
https://github.com/tgstation/tgstation/pull/55164
2021-06-16 01:03:51 +03:00
Artur
337998e99a
https://github.com/tgstation/tgstation/pull/54793
2021-06-16 00:46:05 +03:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
Artur
35bfba1f6a
Redoes the variable changes into procs
2021-05-05 18:15:13 +03:00
Artur
92e6646a4c
time to make blood even more pain
2021-05-05 14:44:21 +03:00
SandPoot
23ac8a1963
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-12-14 11:30:47 -03:00
silicons
8f36a1d2ec
okay
2020-11-22 15:20:52 -07:00
silicons
13ebceb670
why did i do this
2020-11-22 14:56:02 -07:00
silicons
5ae410790b
locking
2020-11-22 14:40:57 -07:00
SandPoot
936ab121ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-18 22:53:23 -03:00
Putnam3145 and GitHub
f6b93a242c
Makes get_damaged_bodyparts use proper arguments ( #13570 )
...
* you're not being clever, you're being obfuscatory, stop this
* Made get_damaged_bodyparts use proper arguments
* Actually shouldn't have the arg
2020-10-17 11:44:15 +02:00
SandPoot
a7a3e6418e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-11 22:09:42 -03: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
Enric Gabriel
7df07d2859
Merge branch 'master' of upstream into master
2020-10-01 12:49:01 -03:00
Timothy Teakettle
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
timothyteakettle
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
Enric Gabriel
600c3b3528
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-18 23:31:57 -03:00
silicons and GitHub
ce80f64d27
Update suppression.dm
2020-08-18 18:52:06 -07:00
Enric Gabriel and GitHub
12c21496b6
Some useful stuff ( #34 )
2020-07-29 22:13:57 -03:00
Timothy Teakettle
93b4570f8d
more changes
2020-07-17 23:23:47 +01:00
kevinz000 and GitHub
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
Ghommie
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
Putnam3145 and GitHub
3531459d8b
Some trauma rebalancing ( #12144 )
...
* Some trauma rebalancing.
* Wow I didn't actually commit the 50% change
* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
DeltaFire15 and GitHub
21c9c98412
> & < agony ( #12082 )
...
hm yes today a check being the wrong way will break exo nanites.
2020-05-02 00:36:03 +02:00
DeltaFire
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
kevinz000 and GitHub
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
necromanceranne
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
Ghommie
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
kevinz000 and GitHub
0ace3f2310
Update buffing.dm
2020-03-06 05:42:28 -07:00
kevinz000 and GitHub
5a580dda20
Update suppression.dm
2020-02-21 18:18:37 -07:00
SandPoot