Commit Graph

1160 Commits

Author SHA1 Message Date
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood
Reworks blood regeneration into something a bit more tame
2021-08-11 02:54:49 -07:00
Lin
dbfa12bead Merge pull request #14981 from Putnam3145/revival-surgery
Makes rod of asclepius usable for revival surgery
2021-08-08 13:58:57 -05:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates
Ports update appearance
2021-08-08 04:06:18 -07:00
Putnam3145
77f62fa7df makes organs decay again 2021-08-03 21:19:28 -07:00
Putnam3145
d22cac4a7a Makes rod of asclepius usable for revival surgery 2021-08-03 17:51:32 -07:00
Putnam3145
d046357418 Merge pull request #14951 from timothyteakettle/leg-split
[TESTMERGE FIRST HOLY SHIT FUCK] fixes every single leg sprite in the entire game
2021-08-03 13:10:06 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
be1e9e4e04 deals with conflicts 2021-07-23 18:53:48 +03:00
timothyteakettle
06ccaf702a bugfixes 2021-07-18 15:10:39 +01:00
timothyteakettle
f55d872376 Update _bodyparts.dm 2021-07-18 14:00:19 +01:00
timothyteakettle
4d1dad2e5b yes 2021-07-18 13:59:45 +01:00
silicons
8710731b87 tweaks 2021-07-01 20:42:55 -07:00
silicons
4ba260c352 fix 2021-06-28 18:26:21 -07:00
silicons
a73ca4be46 scope creep lmao 2021-06-28 12:29:18 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
Putnam3145
85eef816a7 actually makes the default gas damage work, whoops 2021-06-22 22:48:44 -07:00
Putnam3145
0bb5aa57f1 Fixed a bug, accelerated gas mixture del 2021-06-18 01:40:35 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
Putnam
5b84155ac7 makes o2 not just sorta disappear when breathed 2021-06-11 19:06:13 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Putnam
571a25c052 Finished the first auxgm expansion 2021-06-11 16:15:00 -07:00
Putnam
eda6a4d2e2 Aaaa 2021-06-11 05:23:24 -07:00
Putnam
86177c51c4 auxgm part 1
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
silicons
b1b931a7c4 Update _bodyparts.dm 2021-05-27 22:48:24 -07:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
keronshb
6e3e075ff9 Oops forgot something 2021-05-12 13:14:54 -04:00
keronshb
fa067a481a Removes VOG sleep command again
Undocumented change.
2021-05-12 13:09:39 -04:00
Timothy Teakettle
60673d9c5c AAAAAA 2021-05-10 17:13:24 +01:00
Timothy Teakettle
cfcbaa001b fixes 2021-05-10 14:31:36 +01:00
Timothy Teakettle
d479f80f9b linters are literally stupid 2021-05-08 21:19:07 +01:00
timothyteakettle
bb893383bc Update _bodyparts.dm 2021-05-07 17:27:55 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
cb98cbd19f colour backend 2021-04-28 22:33:05 +01:00
Timothy Teakettle
72a009dc7c based? 2021-04-28 19:31:20 +01:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
Timothy Teakettle
371b250623 unused var 2021-04-25 13:24:04 +01:00
Timothy Teakettle
f243c6b7c4 makes them apply properly 2021-04-25 13:23:16 +01:00
timothyteakettle
97e18833d5 better debug info 2021-04-25 00:07:59 +01:00
Timothy Teakettle
fce471cabb debug messages 2021-04-24 23:40:55 +01:00
Timothy Teakettle
ec41b301c7 a 2021-04-24 18:55:07 +01:00
Timothy Teakettle
e89b05cfdd oh dear 2021-04-23 21:13:32 +01:00
necromanceranne
ff866f3f9d Changes emp_vulnerability from the probably to the division of the emp severity. Higher is better. 2021-04-23 12:17:13 +10:00
necromanceranne
c924d47911 brings the values down even further 2021-04-22 13:13:10 +10:00
necromanceranne
0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
silicons
74280ed082 Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
2021-04-18 19:02:53 -06:00
DeltaFire
d4d9fef82c oop 2021-04-16 16:06:34 +02:00