 kevinz000
|
eb50df892a
|
Merge pull request #9550 from Ghommie/Ghommie-cit253
Fixes temporary transformation sting triggering heart attacks on heartless humans.
|
2019-10-24 18:48:09 -07:00 |
|
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
|
Poojawa
|
5773c82c91
|
Adds the blood types as actual blood reagents too
|
2019-10-22 00:33:41 -05:00 |
|
|
Ghommie
|
6ae9349dfe
|
Fixes temporary transformation sting triggering heart attacks on heartless humans.
|
2019-10-20 15:27:19 +02:00 |
|
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
|
kevinz000
|
1d0931ede9
|
Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
|
2019-10-17 13:23:33 -07:00 |
|
|
kevinz000
|
6103ffbafd
|
Merge pull request #9414 from Poojawa/metabolize-lazychem
nerfs styptic/silversulf/synthflesh to have overdoses
|
2019-10-17 13:18:58 -07:00 |
|
|
kevinz000
|
1cc4ccee0d
|
Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
|
2019-10-17 13:13:51 -07:00 |
|
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
|
kevinz000
|
994bfddc1b
|
Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
|
2019-10-16 12:44:34 -07:00 |
|
|
Poojawa
|
4ee608e0c7
|
Fixes blood transfusion, QOL to IV drippers
|
2019-10-16 09:15:04 -05:00 |
|
|
Poojawa
|
14e0087fbd
|
blood sorta works again, needs better fixing tho
|
2019-10-16 04:38:31 -05:00 |
|
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05:00 |
|
|
kevinz000
|
3d5facdea5
|
Merge pull request #9502 from Putnam3145/pandemic-qol2
Makes beaker spawn on pandemic instead of on user when hands full
|
2019-10-15 22:53:44 -07:00 |
|
|
Fermi
|
00adead300
|
Fixes syringes too.
|
2019-10-15 21:43:04 +01:00 |
|
|
Thalpy
|
e115c456f3
|
Ohh I'm fixing
|
2019-10-15 13:41:49 +01:00 |
|
|
Thalpy
|
acc0ff8a17
|
Adds craftable extended mags
|
2019-10-15 12:37:35 +01:00 |
|
|
deathride58
|
9fd4e7f673
|
Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
|
2019-10-15 06:32:59 -04:00 |
|
|
Thalpy
|
23743c8630
|
Updates chemmaster
|
2019-10-15 11:21:05 +01:00 |
|
|
Putnam
|
ee20e23777
|
made beaker spawn on pandemic if hands are full
|
2019-10-14 19:48:20 -07:00 |
|
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
|
Thalpy
|
9f5b228bfe
|
New Dart
|
2019-10-13 22:03:36 +01:00 |
|
|
kevinz000
|
adeb33cdae
|
Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
|
2019-10-13 13:54:26 -07:00 |
|
|
Thalpy
|
3b8ea30d9b
|
I did it
|
2019-10-12 20:06:46 +01:00 |
|
|
Thalpy
|
3f16c287a9
|
I'm big silly
|
2019-10-12 13:40:40 +01:00 |
|
|
Thalpy
|
82446681bf
|
Everything is pain
|
2019-10-12 13:22:05 +01:00 |
|
|
Thalpy
|
d94f796ffb
|
aaaa
|
2019-10-12 12:42:51 +01:00 |
|
|
Fermi
|
2a6b84151e
|
Removed something I didn't mean to
|
2019-10-12 07:59:44 +01:00 |
|
|
Fermi
|
2e03985696
|
aaaa
|
2019-10-12 07:55:19 +01:00 |
|
|
Fermi
|
f922a3dda5
|
Fast!!
|
2019-10-12 07:18:39 +01:00 |
|
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
|
Linzolle
|
b50804dfc3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection
|
2019-10-11 20:06:26 -05:00 |
|
|
kevinz000
|
2e74833e72
|
Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
|
2019-10-11 12:08:12 -07:00 |
|
|
Fermi
|
f165b5e813
|
darn nutrients.
|
2019-10-11 18:58:53 +01:00 |
|
|
Thalpy
|
e517ece612
|
Darnit beaker
|
2019-10-11 08:41:08 +01:00 |
|
|
Poojawa
|
2286d40882
|
why am I making it ignore injections????
The world may never know
|
2019-10-11 01:34:26 -05:00 |
|
|
Winter Flare
|
2bce423ec3
|
Added a -ton- of stuff to the Kinkmate
|
2019-10-10 14:08:14 -04:00 |
|
|
kevinz000
|
fb028b7997
|
Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-10 02:12:41 -07:00 |
|
|
Thalpy
|
8909b0f6c3
|
Merge branch 'master' into Updates-holder
|
2019-10-09 09:01:09 +01:00 |
|
|
Fermi
|
89d3a0534c
|
Tweaker
|
2019-10-09 07:53:20 +01:00 |
|
|
Fermi
|
ad0f34cdf8
|
Tweaks wiki a lil
|
2019-10-09 06:04:06 +01:00 |
|
|
Fermi
|
f5bc825ef0
|
Merge branch 'Wiki-fermi' into Updates-holder
|
2019-10-09 05:35:05 +01:00 |
|
|
Poojawa
|
26e35376d6
|
ok
|
2019-10-08 15:15:56 -05:00 |
|
|
Poojawa
|
c7f52fa292
|
Update other_reagents.dm
|
2019-10-08 14:29:22 -05:00 |
|
|
Poojawa
|
17090d9aff
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 13:51:02 -05:00 |
|
|
Fermi
|
10ce91c686
|
aaa
|
2019-10-08 13:45:16 +01:00 |
|
|
Fermi
|
b397c4868f
|
Theres a bit more limits now
|
2019-10-08 13:23:35 +01:00 |
|
|
Fermi
|
db416defd6
|
Fixes/updates some chems.
|
2019-10-08 13:08:13 +01:00 |
|
|
Fermi
|
a9ad80691e
|
Okay this too
|
2019-10-08 12:57:06 +01:00 |
|