shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,931 Commits 5 Branches 0 Tags
409c8ffe3ec41ff05ba6af8792a73a54af09b331
Commit Graph

3931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 409c8ffe3e Automatic changelog generation for PR #2193 [ci skip] 2017-07-31 14:51:43 -05:00
ktccd a6e74b9a27 Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572 
[MIRROR] Removes a rogue period from the sliver theft objective
 2017-07-31 21:51:42 +02:00
CitadelStationBot 6148b2165c Automatic changelog generation for PR #2186 [ci skip] 2017-07-31 14:48:52 -05:00
ktccd f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547 
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
 2017-07-31 21:48:50 +02:00
ktccd aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540 
[MIRROR] Fixes mutation toxins not stunning properly
 2017-07-31 21:46:03 +02:00
Poojawa f53d66b319 Rabbit parts (#2201) 2017-07-31 05:54:16 -05:00
CitadelStationBot 0aca8441ec Automatic changelog generation for PR #2170 [ci skip] 2017-07-31 03:43:22 -05:00
LetterJay 62d7f47497 Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455 
[MIRROR] Adds 3D Sound System
 2017-07-31 03:43:20 -05:00
LetterJay 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
LetterJay 79bf3edab9 Update syndi.dm 2017-07-31 02:14:50 -05:00
LetterJay 4f324214c5 Update plasmamen.dm 2017-07-31 02:14:15 -05:00
LetterJay 0bba1ec9b6 Update miscellaneous.dm 2017-07-31 02:13:42 -05:00
LetterJay fe37d52cc5 Update hardsuit.dm 2017-07-31 02:12:22 -05:00
LetterJay f90ddf0596 Update lizard.dm 2017-07-30 23:35:11 -05:00
LetterJay bdcc4bc429 Update miscellaneous.dm 2017-07-30 23:33:58 -05:00
LetterJay 4c0c11524b Update syndi.dm 2017-07-30 23:32:50 -05:00
LetterJay a99fa2ea49 Update plasmamen.dm 2017-07-30 23:31:33 -05:00
LetterJay e3dfc8b61d Update miscellaneous.dm 2017-07-30 23:30:51 -05:00
LetterJay 85885330ba Update hardsuit.dm 2017-07-30 23:29:36 -05:00
LetterJay 40216683e0 Update gibspawner.dm 2017-07-30 23:26:16 -05:00
LetterJay feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
CitadelStationBot c4cf30c4eb Automatic changelog generation for PR #2154 [ci skip] 2017-07-30 23:15:34 -05:00
LetterJay c2a1a62a2d Merge pull request #2154 from Citadel-Station-13/upstream-merge-29504 
[MIRROR] Alcohol Bottle Resprite
 2017-07-30 23:15:33 -05:00
LetterJay 77c67b31c6 Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290 
[MIRROR] Unwrenching clockwork structures no longer damages them
 2017-07-30 23:14:39 -05:00
LetterJay 05f7040d12 Merge pull request #2155 from Citadel-Station-13/kevinz000-patch-4 
REEEEEE USE YOUR TRUE/FALSE DEFINES KTCCD
 2017-07-30 23:13:42 -05:00
CitadelStationBot 6e7fff2567 Automatic changelog generation for PR #2189 [ci skip] 2017-07-30 23:12:51 -05:00
LetterJay 6fb37022f5 Merge pull request #2189 from Raeschen/Raes_reducemobs 
Reduces amount of mobs on oldstation.dmm
 2017-07-30 23:12:49 -05:00
CitadelStationBot a98322d497 Removes a rogue period from the sliver theft objective 2017-07-30 19:58:11 -05:00
LetterJay 0ac85c6756 Update sound.dm 2017-07-30 14:43:35 -05:00
LetterJay 896fbdeed7 Update sound.dm 2017-07-30 14:10:59 -05:00
CitadelStationBot 10487c9b54 Automatic changelog generation for PR #2190 [ci skip] 2017-07-30 14:04:25 -05:00
LetterJay ccbb3926d7 Merge pull request #2190 from Citadel-Station-13/upstream-merge-29565 
[MIRROR] Fixes a lot of eye damage procs
 2017-07-30 14:04:23 -05:00
Raeschen 4032f5de36 Used map merging tool 2017-07-30 17:13:39 +01:00
Raeschen e5749b08f7 Merge branch 'Raes_reducemobs' of https://github.com/Raeschen/Citadel-Station-13 into Raes_reducemobs 
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/oldstation.dmm
 2017-07-30 17:10:38 +01:00
Raeschen 824e4287f2 Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.) 
Edit: Actually used map merge this time.
 2017-07-30 17:05:39 +01:00
CitadelStationBot 5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
Raeschen a6662da11d Heavily reduced the amount of mobs on oldstation.dmm due to NPC POOL MC lag. (Previously about 109 hivebots, now there are fewer, stronger ones.) 2017-07-30 14:03:01 +01:00
CitadelStationBot 767b1b3e38 Automatic changelog generation for PR #2054 [ci skip] 2017-07-29 23:56:53 -05:00
LetterJay 70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
LetterJay 0e131b50e5 Merge pull request #2188 from Citadel-Station-13/upstream-merge-29546 
[MIRROR] Grammar fix for revenants
 2017-07-29 23:55:51 -05:00
CitadelStationBot 95f900a97d Adds emergency toolbox to escape pod supplies (#2182) 2017-07-29 19:51:55 -07:00
CitadelStationBot f9a6ee8d76 Give c4 correct plastic_overlay (#2183) 2017-07-29 19:51:38 -07:00
CitadelStationBot 272414bd30 Fixes latejoin antagonist exploit (#2181) 2017-07-29 19:51:16 -07:00
CitadelStationBot e11cd54ad9 Automatic changelog generation for PR #2184 [ci skip] 2017-07-29 21:50:39 -05:00
CitadelStationBot 2d82262e50 Fixes syringes being unable to inject at all if the target has thick clothing on any slot (#2184) 2017-07-29 19:50:37 -07:00
CitadelStationBot 2342c8f2bc Fixes scythes cutting kudzu (#2185) 2017-07-29 19:50:24 -07:00
CitadelStationBot 6990dcbceb Grammar fix for revenants 2017-07-29 21:03:12 -05:00
CitadelStationBot 70df3e8557 Player-controlled medibots are now alerted when they can't heal someone 2017-07-29 19:44:44 -05:00
LetterJay d07b21a9d8 Merge pull request #2174 from Citadel-Station-13/upstream-merge-29325 
[MIRROR] Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
 2017-07-29 15:47:48 -05:00
LetterJay d123e865f0 Merge pull request #2177 from Citadel-Station-13/kevinz000-patch-5 
Fixes DoS vulnerability
 2017-07-29 15:47:32 -05:00