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 |
|
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 |
|
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 |
|
SandPoot
|
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 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03: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 |
|
silicons
|
61ab2a5a53
|
logging fixes
|
2021-02-13 19:47:17 -07: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
|
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 |
|