shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,276 Commits 5 Branches 0 Tags
c947dfdca5b1fd0cef47cd3facbbdcd71ebcbf41
Commit Graph

1964 Commits

Author SHA1 Message Date
Ghommie 892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Ghommie 4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +01:00
Ghommie 29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
TrilbySpaceClone 82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
TrilbySpaceClone bd4501e11c the last touches? 2019-11-03 17:26:28 -05:00
Fermi 37bfb31ee0 Merge branch 'master' into Superbases-goodbye 2019-11-01 00:55:55 +00:00
kevinz000 d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Thalpy 642b27a10f Ghommie 2019-11-01 00:26:22 +00:00
Ghommie 6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie 17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Linzolle 266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000 ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
Ghommie 2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02: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
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 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02: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
Linzolle 9250b1c103 big uppdate season 2019-10-23 21:08:47 -05: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
Thalpy 7ace15d846 oops 2019-10-21 20:58:15 +01:00
Thalpy 36357b3280 Eh this way is probably better. 2019-10-21 19:54:44 +01:00
Thalpy 805079b62c Goodbye, superpH, you were too wild for our world. 2019-10-21 19:44:52 +01: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
Thalpy 67af19a7f0 Merge branch 'master' into FERMICHEMCurTweaks 2019-10-17 16:20:38 +01: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
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