shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,564 Commits 5 Branches 0 Tags
a4e47df4bbd2585a8cc8a79f731bd8e3a5eaa751
Commit Graph
930 Commits
Author SHA1 Message Date
kevinz000andGitHub 487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000andGitHub e70a76085c Merge pull request #9789 from PersianXerxes/fixReagentDescriptions 
Corrects the descriptions of meth and ephedrine
 2019-11-14 01:38:01 -07:00
Persi c784cab060 Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed. 2019-11-12 05:37:30 -05:00
Ghommie 19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie 892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
kevinz000andGitHub d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Ghommie 79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000andGitHub 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 c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +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
kevinz000andGitHub 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
kevinz000andGitHub 6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem 
nerfs styptic/silversulf/synthflesh to have overdoses
 2019-10-17 13:18:58 -07:00
kevinz000andGitHub 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
Ghommie 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
kevinz000andGitHub 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
kevinz000andGitHub 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
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
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
Thalpy 9f5b228bfe New Dart 2019-10-13 22:03:36 +01: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
FermiandFermi 2a6b84151e Removed something I didn't mean to 2019-10-12 07:59:44 +01:00
FermiandFermi 2e03985696 aaaa 2019-10-12 07:55:19 +01:00
FermiandFermi 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
kevinz000andGitHub 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
FermiandFermi f165b5e813 darn nutrients. 2019-10-11 18:58:53 +01:00
Thalpy e517ece612 Darnit beaker 2019-10-11 08:41:08 +01:00
PoojawaandGitHub 2286d40882 why am I making it ignore injections???? 
The world may never know
 2019-10-11 01:34:26 -05:00
kevinz000andGitHub 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
FermiandFermi ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
FermiandFermi 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
FermiandFermi b397c4868f Theres a bit more limits now 2019-10-08 13:23:35 +01:00