Commit Graph

1185 Commits

Author SHA1 Message Date
DeltaFire
855df65ba2 cord cell charge 2021-11-16 22:56:31 +01:00
Putnam3145
da138b1b37 why did i think i could remove this 2021-11-07 16:47:57 -08:00
Putnam3145
aa619e8a3a Fixes simultaneous suffocate/overbreathe 2021-11-07 15:33:08 -08:00
Putnam3145
798f1ae879 and fixes suffocation with literally 0 gas 2021-11-04 09:04:48 -07:00
Putnam3145
f83cd7b57d Lung changes: reckoning 2021-11-04 08:52:50 -07:00
silicons
a32eabb7ae fix 2021-10-29 22:44:01 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-27 13:54:49 -03:00
Putnam3145
136ca1f107 Merge branch 'master' into more-ashwalker-woes 2021-10-18 04:35:57 -07:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
silicons
7c311f9730 Merge pull request #15251 from UncleBourbon/i-love-coding
Adds Neo-Kanji language to roundstart language and space ninja
2021-10-09 22:14:26 -07:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
Cazz
9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Putnam3145
51f85c58a4 One last ashwalker fix 2021-10-04 20:56:08 -07:00
Putnam3145
c169a0408a more ashwalker lung adjustments 2021-09-26 13:13:22 -07:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
silicons
b752cb0af2 Update parts.dm 2021-09-19 11:38:12 -07:00
silicons
c9662f76ed Update parts.dm 2021-09-19 11:35:52 -07:00
Putnam3145
1d0ca33ca7 fixed ashwalkers still not breathing 2021-08-17 08:48:08 -07:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00
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
WanderingFox95
97e4b7aef9 Apply suggestions from code review
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
2021-07-21 19:58:58 +02:00
WanderingFox95
1542903ff7 Lowercase items #1 2021-07-20 22:59:55 +02:00
WanderingFox95
a04543b93f Tribal Surgery Tools
Why not?
2021-07-20 18:51:42 +02: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