shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,927 Commits 5 Branches 0 Tags
4dd67d35e41634ef944fa2fac29bb145b8b55bed
Commit Graph

1604 Commits

Author SHA1 Message Date
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -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
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
silicons
625488891e Merge pull request #14650 from WanderingFox95/WanderingFox95-LavalandWine 
Lavaland Wine: Pinot Mort (Ready)
 2021-05-12 04:43:11 -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
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
Hatterhat
d9977e24b5 Update medicine.dm 2021-03-22 21:29:48 -05:00
Auris456852
8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02: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
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
Lin
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
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
SmArtKar
e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
The0bserver
f6721d02b3 Adds chemicals I missed on the first pass. 2021-02-16 09:53:09 -05:00
Chiirno
8257283cef Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm 
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
 2021-02-15 22:03:12 -04:00
Chiirno
8ea8f4e7e9 just a little tweak 2021-02-15 18:31:07 -04:00
Putnam
d965834048 Set buzz fuzz's addiction threshold to actually be what the comment says. 2021-02-15 00:52:17 -08:00
Fermi
f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Fermi
fe3dbb32ba Removes buffer from dispensers 2021-02-04 01:13:08 +00:00
Lin
2d3627b75c Merge pull request #13895 from Citadel-Station-13/silicons-patch-53 
Restores speedup to meth and nuka cola
 2021-01-31 23:35:37 -06:00
Putnam3145
8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14 
disables rotatium due to it being horifically bugged and unmaintained
 2021-01-26 22:24:14 -08:00
silicons
72716068ba Merge pull request #14101 from Hatterhat/more-gauze-shit 
some other gauze parity dogshit
 2021-01-20 15:26:41 -07:00
silicons
9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync 
[s] semi sync- we forgot the anti ddos thing
 2021-01-20 15:14:37 -07:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
Hatterhat
90b85480e1 uuuuuuuuuuuuugh 2021-01-19 17:07:10 -06:00
Hatterhat
1445f448e9 uuuuuuuuuuuuuuuuuuugh 2021-01-19 17:04:59 -06:00
kittycat2002
b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name 
This fixes an issue that occurs when attempting to find Ethanol by name using get_chem_id.
 2021-01-18 21:39:34 -05:00
silicons
0db94c5aa8 Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-17 20:41:48 -07:00
silicons
c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy 
Makes Buzz Fuzz go on a diet
 2021-01-17 20:40:22 -07:00