zerothebigboy
4c82eeeb2a
soup
2021-09-18 18:18:04 -04:00
silicons
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
silicons
149d149dff
Merge pull request #15102 from timothyteakettle/icecream
...
allows custom taste text and color on the custom ice cream setting in the ice cream vat
2021-09-10 22:17:25 -07:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -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
zerothebigboy
30134a0d2f
cool
2021-09-01 06:32:33 -04: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
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
4fa81ba13c
Merge pull request #14878 from Putnam3145/remove-sleeps
...
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out in processing
2021-07-01 21:57:19 -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
d59ced8f28
changes
2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1
logic
2021-06-28 18:46:25 -07:00
silicons
e690cea147
fix
2021-06-28 18:33:14 -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
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
silicons
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -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
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -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
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
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
zerothebigboy
37873d6750
gommit
2021-05-15 08:52:24 -04:00
silicons
625488891e
Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
...
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
silicons
44fdbaadcb
Merge pull request #14684 from zeroisthebiggay/pirates
...
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
Lin
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
