e65f386de9
Makes eggnog not alcoholic
2023-12-23 14:22:58 -08:00
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
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
d0fc25bb0e
empty lastline
2021-06-21 19:11:49 +02:00
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
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
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
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
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
1a72070f5c
slimejelly
...
a
2021-06-07 21:44:33 -04:00
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
d03bf641dd
extreme optimization project to maybe fix game
2021-06-06 21:58:24 -07:00
37873d6750
gommit
2021-05-15 08:52:24 -04:00
625488891e
Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine
...
Lavaland Wine: Pinot Mort (Ready)
2021-05-12 04:43:11 -06:00
44fdbaadcb
Merge pull request #14684 from zeroisthebiggay/pirates
...
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
470f417a6b
Merge pull request #14687 from Arturlang/cum_blood_fixes
...
Fixes virus bottles being white
2021-05-07 00:54:53 -05:00
e5646404d7
Fixes virus bottles being white
2021-05-05 21:34:53 +03:00
b1c20269a6
he'sstillafurry
2021-05-05 03:38:14 -04:00
5138d86655
skylarlineman'safurry
2021-05-05 03:35:25 -04:00
d547aa7ff1
almost compiling
2021-04-26 23:37:26 -07:00
1585d1c2be
fixes
2021-04-26 23:32:33 -07:00
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
bbd8086f7b
Updated description to fit more with the icon
2021-04-21 14:53:35 +02:00
c25c502b35
The taste of Lavaland for you.
...
It's really not that great.
2021-04-20 19:39:40 +02:00
9105413f69
Merge pull request #14574 from BlueWildrose/swippityswap
...
Container swapping for Pandemic machine
2021-04-08 03:24:36 -06:00
9239c1eb52
Beaker swapping for Pandemic machine
2021-04-05 23:06:35 -07:00
b363cdd5ca
fixes puddles, cultism checks, spellchecks
2021-04-01 04:29:35 -07:00
20cd8568e8
Merge pull request #14498 from Hatterhat/patch-2
...
medsuture/medmesh recipe buff
2021-03-23 23:15:26 +01:00
d9977e24b5
Update medicine.dm
2021-03-22 21:29:48 -05:00
524bb79f0e
tgui machine broke
2021-03-19 15:32:53 -03:00
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
8334e8c2c0
Corrects Hexacamphor
2021-03-10 00:35:00 +02:00
8fc1dc9c29
changes
2021-02-28 00:40:04 -07:00
e483ce8dfc
changes
2021-02-28 00:05:32 -07:00
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
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
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
51595705e4
simpin for slimes
2021-02-26 20:59:28 +01:00
ae63422727
Merge pull request #14269 from Putnam3145/aphro-readd
...
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
841bb2aac2
Merge pull request #14265 from SandPoot/tool_behavior-replacing
...
Tool behavior replacing
2021-02-21 14:48:50 -07:00
0e01f2826b
Merge pull request #14251 from Chiirno/SynthHuskTweak
...
Massive synthflesh buff
2021-02-18 23:34:53 -06:00
ecc1ff26bb
Slightly more logging, whoops added pref
2021-02-18 21:27:59 -08:00
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
2e29f30fdf
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
2021-02-18 15:04:22 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
8bf3706876
Merge pull request #14249 from Putnam3145/buzz-fuzz-fix
...
Set buzz fuzz's addiction threshold to fit the comment
2021-02-18 00:11:13 -06:00
Putnam3145