cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,205 Commits 55 Branches 0 Tags
ab827ff8dc87142da023bb46bc703b17a1ab65b5
Commit Graph

2161 Commits

Author SHA1 Message Date
Putnam3145
b213aaec2e A preliminary implementation of chem gases 2021-06-27 07:58:35 -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
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
zerothebigboy
b1c20269a6 he'sstillafurry 2021-05-05 03:38:14 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
silicons
d547aa7ff1 almost compiling 2021-04-26 23:37:26 -07:00
silicons
1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
WanderingFox95
bbd8086f7b Updated description to fit more with the icon 2021-04-21 14:53:35 +02:00
WanderingFox95
c25c502b35 The taste of Lavaland for you. 
It's really not that great.
 2021-04-20 19:39:40 +02:00
silicons
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
DeltaFire
20cd8568e8 Merge pull request #14498 from Hatterhat/patch-2 
medsuture/medmesh recipe buff
 2021-03-23 23:15:26 +01:00
Hatterhat
d9977e24b5 Update medicine.dm 2021-03-22 21:29:48 -05:00
kappa-sama
524bb79f0e tgui machine broke 2021-03-19 15:32:53 -03:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
Auris456852
8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
silicons
8fc1dc9c29 changes 2021-02-28 00:40:04 -07:00
silicons
e483ce8dfc changes 2021-02-28 00:05:32 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
Lin
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
silicons
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
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing 
Tool behavior replacing
 2021-02-21 14:48:50 -07:00
Lin
0e01f2826b Merge pull request #14251 from Chiirno/SynthHuskTweak 
Massive synthflesh buff
 2021-02-18 23:34:53 -06:00
Putnam
ecc1ff26bb Slightly more logging, whoops added pref 2021-02-18 21:27:59 -08:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00