shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,060 Commits 5 Branches 0 Tags
bf92aa2ffb09d69e3576ce3e0ae87788d4bcd3bd
Commit Graph
1534 Commits
Author SHA1 Message Date
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Poojawa bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
Jay 02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Thalpy 06599523a9 Ghommie is a saint 2019-10-13 22:06:57 +01:00
kevinz000andGitHub adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes 
Updating Kinkmate item-list
 2019-10-13 13:54:26 -07:00
Zna12 023d031f15 Update toylathe.dm 
Cleans up the autoylathe code, brings it back in line with the current autolathe. Also fixes an issue with the autoylathe not updating it's screen on click.
 2019-10-13 14:40:19 -05:00
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
Winter Flare 6709dbd161 Requested Change 2019-10-11 13:25:23 -04:00
Winter Flare 2c54e7390d Update vending.dm 2019-10-11 02:54:44 -04:00
Winter Flare 7a454e448a I forgot the one item I wanted to add. 2019-10-11 02:54:23 -04:00
Winter Flare 3afbc5733c Update vending.dm 2019-10-11 01:14:09 -04:00
Winter Flare 2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
kevinz000andGitHub b233d3556e Merge pull request #9439 from JTGSZ/dominatorfix 
Fixes Dominator countdown continuing after BoH movement, tweaks view amount
 2019-10-10 02:12:55 -07: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
JTGSZ 5024c8664b Lowers view amount of turfs, fixes BOH moving dominator 2019-10-08 01:02:45 -04:00
nik707andGitHub de117afd8b Merge pull request #9410 from Poojawa/cryopod-tweaks 
Fixes Cryopod quirks, makes the menu not complete shit
 2019-10-07 18:24:38 -05: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
Poojawa 0716b48a99 unmodularize it 2019-10-04 06:56:57 -05:00
kevinz000andGitHub 828fe6e555 Merge pull request #9385 from Sishen1542/hypereut 
fixing divine lightblade (chaplain hypereut) having energy reflect
 2019-10-03 23:15:29 -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
Jay 70cbd8c1ca fixes bad icon path 2019-10-02 22:11:42 -05: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
Sishen 8b766130f8 Update eutactic_blades.dm 2019-10-02 12:48:17 -04:00
Chayse Ramsay 68ca8a5ac0 whoops 2019-10-02 11:55:38 +01:00
Poojawa 0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
Sishen a2a6fa17fe Update eutactic_blades.dm 2019-10-01 23:33:14 -04:00
FermiandFermi 89f3a01bc0 Merge branch 'master' into tg-Organ-port 2019-10-01 06:17:58 +01:00