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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,289 Commits 55 Branches 0 Tags
acf06abed5cc10f8ab3ad173fbd4fc355ad64553
Commit Graph

2001 Commits

Author SHA1 Message Date
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
8cb8ddef42 Merge pull request #13969 from Arturlang/blood_bag_tweaks 
Tweaks blood bag consumption
 2021-01-20 15:26:12 -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
Arturlang
cc4c3533b7 Apply suggestions from code review 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-01-20 02:25:22 +02: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
Fermi
cb614bcd95 Merge branch 'master' into Dispencer-UI-change 2021-01-17 22:19:45 +00:00
YakumoChen
693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00
Hatterhat
798b25846d gauze parity 2021-01-14 20:53:55 -06:00
silicons
608465f1ed Update toxin_reagents.dm 2021-01-14 17:14:09 -07:00
Artur
19f27f2f59 Somehow forgot this very important detail 2021-01-14 10:57:46 +02:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Artur
df825b4441 deltafire's suggested fixes 2021-01-12 00:23:39 +02:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs 
low level reagent logging additions
 2021-01-09 16:24:40 +00:00
silicons
0d781aa71e Update chem_dispenser.dm 2021-01-08 01:17:56 -07:00
Artur
ffe20839fe tweaks loss numbers 2021-01-04 23:46:48 +02:00
Artur
6388c3cf55 Blood bag delays 2021-01-04 23:43:33 +02:00
Fermi
619490b040 oops 2021-01-04 16:32:06 +00:00
Fermi
5b703e84a4 Merge branch 'master' into Dispencer-UI-change 2021-01-04 16:21:06 +00:00
Fermi
d9047e458c Testing and bugfixes 2021-01-04 15:47:35 +00:00
Fermi
57cd698994 Tweaks and fixes. Should be freature complete now. 2021-01-04 13:40:26 +00:00
Fermi
c7965d3b4a Pushing to review diff 2021-01-04 10:53:21 +00:00
Fermi
37c3bbbd9c Fixing things and gui 2021-01-04 01:48:35 +00:00
Chiirno
da5ea18c9a OK, compiling did something funky to the dm code? 2021-01-01 04:04:39 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00
silicons
8a471d6984 logs 2020-12-31 12:35:45 -08:00
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
silicons
3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid 
salicyclic acid
 2020-12-30 14:46:04 -07:00
raspy-on-osu
d2c0e1ba41 salicyclic acid 2020-12-29 02:35:42 -05:00
silicons
c4de817870 Update drink_reagents.dm 2020-12-27 12:48:02 -07:00
silicons
94b3f03b24 Update drug_reagents.dm 2020-12-27 12:45:57 -07:00
silicons
952f5f8716 Update drug_reagents.dm 2020-12-27 12:32:14 -07:00
DeltaFire
219470e8c6 Merge pull request #13815 from YakumoChen/no-ezchem 
Removes slime blood to jelly conversion
 2020-12-22 06:17:41 +01:00
YakumoChen
3bdf4bacdc removes slime blood conversion 2020-12-19 10:28:56 +00:00
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
BlackMajor
8f30d5a686 Update borghydro.dm 2020-12-19 00:46:04 +13:00
MrJWhit
d10c9db8b2 Update reagent_dispenser.dm 2020-12-11 10:31:42 -05:00
MrJWhit
477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
DeltaFire
69127ebec6 e 2020-11-25 18:06:08 +01:00
DeltaFire
24b712c71e better way to do this 2020-11-25 15:42:43 +01:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00