shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,837 Commits 5 Branches 0 Tags
dd101ef221d13bdae1dfd653487f524bc1722c38
Commit Graph
1368 Commits
Author SHA1 Message Date
Thalpy 3b8ea30d9b I did it 2019-10-12 20:06:46 +01:00
Thalpy f6796b93b3 Fixes graft 2019-10-12 18:22:48 +01:00
FermiandFermi 2e03985696 aaaa 2019-10-12 07:55:19 +01:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000andGitHub a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227 
Fixing a runtime when examining unloaded cit hyposprays.
 2019-10-11 12:16:50 -07: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
deathride58 60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) 2019-10-11 14:33:32 -04:00
Ghommie 26e6ba9686 Fixing a runtime when examining unloaded cit hyposprays. 2019-10-09 18:34:54 +02:00
FermiandFermi ad0f34cdf8 Tweaks wiki a lil 2019-10-09 06:04:06 +01:00
Ghommie 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
FermiandFermi bc118d5ead Merge branch 'master' into Updates-holder 2019-10-08 12:21:56 +01:00
FermiandFermi b8c87a5f40 Spicy 2019-10-08 12:05:06 +01:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000andGitHub 922e9849bd Merge pull request #9391 from GrayRachnid/rebalancesk9borgs 
Rebalances k9borg pounce/bite around the secborg's baton.
 2019-10-08 00:36:26 -07:00
ThalpyandGitHub 564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000andGitHub 0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
nik707andGitHub 6803338df2 Merge pull request #9384 from jakeramsay007/Moar-Bugfixes 
Fixes the Trek uniform/suit sprites
 2019-10-07 18:19:59 -05:00
ThalpyandGitHub 27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
kevinz000andGitHub 356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE 
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
 2019-10-05 08:26:40 -07:00
FermiandFermi 2abd15c7e7 Incase someone speedmerges 2019-10-04 04:48:34 +01:00
GrayRachnid 7d579e6a0f Removed cell charge on bite. 2019-10-03 23:33:38 -04:00
GrayRachnid 211e7a2c60 removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments. 2019-10-03 23:05:38 -04:00
FermiandFermi d1c381cad3 lye down 2019-10-04 03:27:30 +01:00
FermiandFermi 10f5fc3b47 Buffer fix 2019-10-04 03:22:53 +01:00
Ghommie 6bd0b85e54 I'd rather add a redundant get_held_index_of_item(I) than allow it to render privates over and over again. 2019-10-03 19:32:11 +02:00
Ghommie 59e6ed7014 inventory.dm is a mess too. 2019-10-03 19:09:47 +02:00
Ghommie a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. 2019-10-03 19:08:11 +02:00
Ghommie 7c77f2d2e3 testing... 2019-10-03 08:57:35 +02:00
Jay 70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05:00
Ghommie 6dbac16c74 Sanitizing the fermis code biohazard. 2019-10-03 04:31:11 +02:00
GrayRachnid ad9ddcb6da Reduces cell charge to 750, spoolup time to 1 and reduces self-stun if missed. 2019-10-02 19:30:23 -04:00
GrayRachnid e24c2ac249 Rebalances dogborg pounce/bite around the secborg's harmbaton. 2019-10-02 14:56:32 -04:00
Chayse Ramsay 68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
Ghommie 02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
Poojawa 0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
FermiandFermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00
Poojawa 117e5a409d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 00:05:44 -05:00
Jay e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
Thalpy 1bdb66d5de Okay a few things I just saw 2019-09-27 07:28:02 +01:00
FermiandFermi 8dcf74d5f0 Makes buffers not react with stab agent 2019-09-22 12:02:20 +01:00
Poojawa 5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
FermiandFermi 97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
FermiandFermi f8dfb1e3aa Okay. 2019-09-21 12:45:10 +01:00
FermiandFermi a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
kevinz000andGitHub af157e85fb Update living.dm 2019-09-21 01:48:58 -07:00
kevinz000andGitHub 313956002b Merge pull request #9269 from Thalpy/FermiGrenades 
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
 2019-09-21 01:46:22 -07:00
kevinz000andGitHub 3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal 
Removes a lot of unused files
 2019-09-21 01:45:11 -07:00
kevinz000andGitHub f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193 
Fixed a few dozen suits' body coverage inconsistencies.
 2019-09-21 01:43:52 -07:00
FermiandFermi 15d36cbaa1 I need to stop leaving .dm files open in dreammaker. 2019-09-21 09:37:54 +01:00