Commit Graph

595 Commits

Author SHA1 Message Date
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
Ghommie
20d9adaccd Floaty floating. 2019-10-23 20:43:05 +02:00
Ghommie
c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
deathride58
a7de466a01 Merge pull request #9534 from Linzolle/abductor-science-man
URGENT fixes for abductors
2019-10-21 22:30:07 -04:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
kevinz000
659e8edf69 Merge pull request #9522 from Linzolle/tend-wounds
Tend Wounds + Make Revival more accessible
2019-10-19 19:52:21 -07:00
Linzolle
eb1e064c49 oh yeah surgeon 2019-10-19 10:48:30 -05:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Linzolle
b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
Linzolle
88814415dc tend wounds 2019-10-17 16:59:33 -05:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Thalpy
4b069afb42 Scrub a dub dub 2019-10-15 08:42:40 +01:00
Thalpy
91762d7c65 Cleanup 2019-10-15 08:22:53 +01:00
lolman360
140306a97f Update tools.dm 2019-10-15 13:25:41 +11:00
Fermi
a80b5c8a84 Autosurgies 2019-10-14 13:39:39 +01:00
Fermi
8ddd5402fe Mobcheck 2019-10-14 13:35:42 +01:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Thalpy
8a5562e92e Ghmoneie 2019-10-13 23:56:18 +01:00
Thalpy
924fa50659 Update code/modules/surgery/organs/organ_internal.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-13 23:55:42 +01:00
Thalpy
094221f4ae IndenettSADgsdfafhfdnfzbdf 2019-10-13 23:52:34 +01:00
Thalpy
7973347bf3 indent 2019-10-13 23:50:25 +01:00
Thalpy
1621c4c7d4 stupid bitflags 2019-10-13 23:50:08 +01:00
Thalpy
e7c5e74d3a Hopefully no break 2019-10-13 23:41:06 +01:00
Thalpy
6a74bf7093 Removes pointless line 2019-10-13 22:35:43 +01:00
Thalpy
a13218b99a Fixes Coronary and Lipo 2019-10-13 17:23:49 +01:00
lolman360
3211138a75 wwwwwwww 2019-10-13 18:07:25 +11:00
Thalpy
3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy
f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
Thalpy
04b40fd557 Tongues decay slower. 2019-10-12 18:01:02 +01:00
Thalpy
96d5a0f74c Heart decay 2019-10-12 18:00:34 +01:00
Thalpy
7ad16947a7 Cleanups 2019-10-12 18:00:16 +01:00
Thalpy
cbc20d33d5 Phew 2019-10-12 15:13:18 +01:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Linzolle
730ca35a31 this really shuoldn't be here 2019-10-11 21:10:10 -05:00
Linzolle
9ac22a9fc5 god damn it fermis 2019-10-11 20:19:22 -05:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
kevinz000
46994f2475 Merge pull request #9448 from MrJWhit/zombie-eyes
Makes zombie smell through their eyes
2019-10-11 12:16:06 -07:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
Poojawa
26e35376d6 ok 2019-10-08 15:15:56 -05:00
MrJWhit
2629402fa4 Makes zombie smell through their eyes
Gives zombie eyes the SEE_MOBS flag, the same as xenos, to let them "smell" living flesh.
2019-10-08 14:53:00 -04:00
lolman360
5cc16011ac paren 2019-10-08 20:13:44 +11:00
lolman360
ddb781a144 examines 2019-10-08 20:09:07 +11:00