 siliconsandGitHub
|
e342145663
|
Merge pull request #15070 from zeroisthebiggay/prisoners
prisoners - aka ports prisoners from tg hell yeah
|
2021-09-12 20:59:12 -07:00 |
|
|
zerothebigboy
|
f077f374bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why
|
2021-09-11 23:04:48 -04:00 |
|
|
zerothebigboy
|
ba72e3d8f0
|
why
|
2021-09-11 23:04:21 -04:00 |
|
|
Timothy Teakettle
|
ccebece42e
|
icecream
|
2021-09-08 18:18:27 +01:00 |
|
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Artur
|
5acd7fef2d
|
makes salglu not deadly
|
2021-08-02 21:54:47 +03:00 |
|
|
Artur
|
6b5bdae184
|
salglu works like normal now again and adds more sanity
|
2021-07-29 23:55:27 +03:00 |
|
|
Artur
|
2fec997e1f
|
No longer neccesary
|
2021-07-29 20:12:38 +03:00 |
|
|
Artur
|
82ccfc40dc
|
/obj/screen --> /atom/movable/screen
|
2021-07-29 13:57:19 +03:00 |
|
|
Artur
|
2adfbea215
|
Merge remote-tracking branch 'origin/master' into fake_blood
|
2021-07-23 18:50:09 +03:00 |
|
|
silicons
|
3070f178e0
|
Merge remote-tracking branch 'citadel/master' into combat_patches_1
|
2021-07-18 15:12:52 -07:00 |
|
|
Putnam3145
|
899e74fc83
|
Componentized acid
|
2021-07-03 22:10:44 -07:00 |
|
|
silicons
|
8710731b87
|
tweaks
|
2021-07-01 20:42:55 -07:00 |
|
|
Putnam3145
|
f3b590f5f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps
|
2021-06-30 02:19:02 -07:00 |
|
|
silicons
|
55608737fa
|
more..
|
2021-06-28 14:51:55 -07:00 |
|
|
silicons
|
833a7b958f
|
fix
|
2021-06-28 13:24:12 -07:00 |
|
|
silicons
|
7c87f6c7b7
|
sigh
|
2021-06-28 13:17:55 -07:00 |
|
|
silicons
|
0069f12c6f
|
errors
|
2021-06-28 13:17:14 -07:00 |
|
|
silicons
|
4653deddec
|
updates
|
2021-06-28 12:55:22 -07:00 |
|
|
silicons
|
a73ca4be46
|
scope creep lmao
|
2021-06-28 12:29:18 -07:00 |
|
|
siliconsandGitHub
|
5204f5a6d9
|
Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
|
2021-06-27 11:01:32 -07:00 |
|
|
DeltaFire
|
d0fc25bb0e
|
empty lastline
|
2021-06-21 19:11:49 +02:00 |
|
|
DeltaFire
|
c7a098da06
|
suffering (aka, a bunch of fixes)
|
2021-06-21 19:05:31 +02:00 |
|
|
Putnam3145
|
c06983ce09
|
uh... does this?
|
2021-06-21 09:27:32 -07:00 |
|
|
Putnam3145
|
0bf383a90b
|
does this fix it
|
2021-06-21 09:18:06 -07:00 |
|
|
Putnam3145
|
f77495f45d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-06-21 02:19:51 -07:00 |
|
|
Artur
|
724b34f55d
|
https://github.com/tgstation/tgstation/pull/54710
|
2021-06-16 00:44:32 +03: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
|
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 |
|
|
bunny232
|
1a72070f5c
|
slimejelly
a
|
2021-06-07 21:44:33 -04:00 |
|
|
Putnam
|
d03bf641dd
|
extreme optimization project to maybe fix game
|
2021-06-06 21:58:24 -07:00 |
|
|
zerothebigboy
|
37873d6750
|
gommit
|
2021-05-15 08:52:24 -04:00 |
|
|
siliconsandGitHub
|
625488891e
|
Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
Lavaland Wine: Pinot Mort (Ready)
|
2021-05-12 04:43:11 -06:00 |
|
|
LinandGitHub
|
470f417a6b
|
Merge pull request #14687 from Arturlang/cum_blood_fixes
Fixes virus bottles being white
|
2021-05-07 00:54:53 -05:00 |
|
|
Artur
|
e5646404d7
|
Fixes virus bottles being white
|
2021-05-05 21:34:53 +03:00 |
|
|
Artur
|
35bfba1f6a
|
Redoes the variable changes into procs
|
2021-05-05 18:15:13 +03:00 |
|
|
Artur
|
28205f9dce
|
More fixes to make it work
|
2021-05-05 17:41:37 +03:00 |
|
|
Artur
|
d9f6e51bc8
|
making it actually work properly
|
2021-05-05 15:26:20 +03:00 |
|
|
Artur
|
92e6646a4c
|
time to make blood even more pain
|
2021-05-05 14:44:21 +03:00 |
|
|
WanderingFox95andGitHub
|
bbd8086f7b
|
Updated description to fit more with the icon
|
2021-04-21 14:53:35 +02:00 |
|
|
WanderingFox95andGitHub
|
c25c502b35
|
The taste of Lavaland for you.
It's really not that great.
|
2021-04-20 19:39:40 +02:00 |
|
|
siliconsandGitHub
|
9105413f69
|
Merge pull request #14574 from BlueWildrose/swippityswap
Container swapping for Pandemic machine
|
2021-04-08 03:24:36 -06:00 |
|
|
Blue Wildrose
|
9239c1eb52
|
Beaker swapping for Pandemic machine
|
2021-04-05 23:06:35 -07:00 |
|
|
Blue Wildrose
|
b363cdd5ca
|
fixes puddles, cultism checks, spellchecks
|
2021-04-01 04:29:35 -07:00 |
|
|
HatterhatandGitHub
|
d9977e24b5
|
Update medicine.dm
|
2021-03-22 21:29:48 -05:00 |
|
|
Auris456852andGitHub
|
8334e8c2c0
|
Corrects Hexacamphor
|
2021-03-10 00:35:00 +02:00 |
|
|
LinandGitHub
|
4cd12649d2
|
Merge pull request #14325 from dzahlus/slime-fix
Fixes toxin healing for slimes in heretic related stuff
|
2021-02-27 14:41:33 -06:00 |
|
|
siliconsandGitHub
|
318f9f5a3d
|
Merge pull request #14289 from TheObserver-sys/BotanyPassII
Botany Pass II: How the hell did it take me this long to notice that these things aren't functioning????
|
2021-02-26 13:38:56 -07:00 |
|
|
dzahlus
|
51595705e4
|
simpin for slimes
|
2021-02-26 20:59:28 +01:00 |
|