shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,220 Commits 5 Branches 0 Tags
4db896ed2d587fdca08cff79045432fd4e8c2036
Commit Graph

6220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
4db896ed2d Merge pull request #3127 from Raeschen/master 
Attempt 2 at adding FTL's "Milky way" to lobby music roster
 2017-10-04 18:43:24 -04:00
LetterJay
e6ccc7077a Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279 
[MIRROR] why plus a minus value and not just minus the value...
 2017-10-04 18:43:04 -04:00
CitadelStationBot
497a49337d Automatic changelog generation for PR #3114 [ci skip] 2017-10-04 17:42:04 -05:00
LetterJay
8c77408bb1 Merge pull request #3114 from Daniel0Mclovin/patch-2 
Rebalanced pod people so they arnt as weak.
 2017-10-04 18:42:02 -04:00
LetterJay
944c749dfc Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256 
[MIRROR] Zombies regen toxin damage
 2017-10-04 18:41:45 -04:00
CitadelStationBot
1be8e9891b Automatic changelog generation for PR #3105 [ci skip] 2017-10-04 17:40:58 -05:00
LetterJay
6fe3f2a6b9 Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125 
[MIRROR] Fixes stealth nerf to detectives gun
 2017-10-04 18:40:56 -04:00
Raeschen
e3f8145b07 Merge branch 'master' into master 2017-10-04 20:24:26 +01:00
Raeschen
26c262542e Merge branch 'master' into master 2017-10-04 20:23:58 +01:00
Raeschen
48e5582d0a Attempt 2 at adding FTL's "Milky way" to lobby music roster 2017-10-04 20:20:09 +01:00
CitadelStationBot
d6e0bb03cd why plus a minus value and not just minus the value... 2017-10-04 14:03:20 -05:00
kevinz000
1a3fc9f1c6 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:03:20 -05:00
LetterJay
282dcb3c16 Merge pull request #3121 from Citadel-Station-13/upstream-merge-31267 
[MIRROR] Dummies used for preference setup always immediately compile their overlays
 2017-10-04 12:29:21 -04:00
LetterJay
6fec59e75b Merge pull request #3120 from Citadel-Station-13/upstream-merge-31268 
[MIRROR] Hotfix: Fixes Carpsie nullrod from being invisible
 2017-10-04 12:28:59 -04:00
LetterJay
2ec7958a87 Merge pull request #3118 from Citadel-Station-13/upstream-merge-31260 
[MIRROR] Adds missing abductor metal sheet sprites
 2017-10-04 12:28:41 -04:00
LetterJay
c08ff0dead Merge pull request #3116 from Citadel-Station-13/upstream-merge-31261 
[MIRROR] Fixes species locked slots alpha.
 2017-10-04 12:28:25 -04:00
CitadelStationBot
67bf519df5 Automatic changelog generation for PR #3115 [ci skip] 2017-10-04 11:28:16 -05:00
LetterJay
d8d75099e5 Merge pull request #3115 from Citadel-Station-13/upstream-merge-31241 
[MIRROR] Makes gutlunches hungry for gibs again
 2017-10-04 12:28:14 -04:00
LetterJay
4959746caf Merge pull request #3113 from Citadel-Station-13/upstream-merge-31237 
[MIRROR] Server tools API update to 3.1.0.1
 2017-10-04 12:27:53 -04:00
CitadelStationBot
8ece467024 Dummies used for preference setup always immediately compile their overlays 2017-10-04 11:03:47 -05:00
Jordan Brown
cbf7ff0fc7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 11:03:47 -05:00
CitadelStationBot
a0d4bd8813 Hotfix: Fixes Carpsie nullrod from being invisible 2017-10-04 11:00:34 -05:00
ExcessiveUseOfCobblestone
fe5b45dfeb Fixes Carpsie nullrod from being invisible (#31268) 2017-10-04 11:00:34 -05:00
CitadelStationBot
63d9d2facb Adds missing abductor metal sheet sprites 2017-10-04 06:15:07 -05:00
Leo
5b8eb58266 Merge pull request #31260 from ShizCalev/alium-sheets 
Adds missing abductor metal sheet sprites
 2017-10-04 06:15:07 -05:00
CitadelStationBot
90f6272117 Zombies regen toxin damage 2017-10-04 06:14:57 -05:00
Leo
c03513b65d Merge pull request #31256 from ShizCalev/zombie-toxin 
Zombies regen toxin damage
 2017-10-04 06:14:57 -05:00
CitadelStationBot
90bd29cba5 Fixes species locked slots alpha. 2017-10-04 06:12:46 -05:00
Leo
951c9d04f2 Merge pull request #31261 from AnturK/lockedslot 
Fixes species locked slots alpha.
 2017-10-04 06:12:46 -05:00
CitadelStationBot
85e74900cb Makes gutlunches hungry for gibs again 2017-10-04 04:11:33 -05:00
vuonojenmustaturska
cdc7695741 Makes gutlunches hungry for gibs again (#31241) 
* gutlunch fix

* combine ifs, removes unneeded check
 2017-10-04 04:11:33 -05:00
CitadelStationBot
daa5bc6128 Automatic changelog generation for PR #3110 [ci skip] 2017-10-04 01:14:23 -05:00
LetterJay
0515d2b754 Merge pull request #3110 from Citadel-Station-13/upstream-merge-31034 
[MIRROR] Nightmare organs
 2017-10-04 02:14:22 -04:00
CitadelStationBot
07e407a02f Automatic changelog generation for PR #3108 [ci skip] 2017-10-04 01:14:09 -05:00
LetterJay
719b433ede Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179 
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
 2017-10-04 02:14:07 -04:00
CitadelStationBot
3a5e3bc530 Automatic changelog generation for PR #3104 [ci skip] 2017-10-04 01:13:37 -05:00
LetterJay
05d9c9d3a2 Merge pull request #3104 from Citadel-Station-13/upstream-merge-31181 
[MIRROR] Blobs now take damage from particle accelerators
 2017-10-04 02:13:35 -04:00
John
315967bd15 Rebalanced pod people so they arnt as weak. 
This will allow podpeople to regen at a steady pace without them being able to take tool boxes to the head like candy. it takes around 15 seconds to notably heal compared to the 40 it does just for a little bit and the 3 from before it was nerfed. The fact that podpeople need to go to the medbay to fix burn damage made me decide to make their brute regen stronger, not to mention that a single welder smach gives 18.75 damage and a shot to the leg with a laser carbine does 25 burn damage.
 2017-10-03 23:10:50 -05:00
CitadelStationBot
f8f278dfd5 Automatic changelog generation for PR #3093 [ci skip] 2017-10-03 19:16:12 -05:00
LetterJay
0830e6907e Merge pull request #3093 from Kevak/Shock-Collars 
Shock Collars Are Now A Thing.
 2017-10-03 20:16:10 -04:00
LetterJay
454fb160a8 Merge pull request #3112 from Citadel-Station-13/upstream-merge-31188 
[MIRROR] Gives nightmares a random shadowling name
 2017-10-03 20:15:31 -04:00
LetterJay
d72f1c380a Merge pull request #3111 from Citadel-Station-13/upstream-merge-30998 
[MIRROR] Issues created with the report issue button will contain the round ID
 2017-10-03 20:15:11 -04:00
LetterJay
1c199d426b Merge branch 'master' into upstream-merge-31034 2017-10-03 20:15:07 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232 
[MIRROR] Fixes mech fab runtime
 2017-10-03 20:13:06 -04:00
LetterJay
3e975eca09 Merge pull request #3107 from Citadel-Station-13/upstream-merge-31135 
[MIRROR] Adds a var to minds that makes them immune to conversion
 2017-10-03 20:12:43 -04:00
LetterJay
84d98d5973 Merge pull request #3106 from Citadel-Station-13/upstream-merge-31208 
[MIRROR] Makes mobs on fire light up
 2017-10-03 20:12:24 -04:00
CitadelStationBot
b7473ec008 Automatic changelog generation for PR #3102 [ci skip] 2017-10-03 19:11:26 -05:00
LetterJay
b5e0981d62 Merge pull request #3102 from Citadel-Station-13/upstream-merge-31250 
[MIRROR] Greatly speeds up bees
 2017-10-03 20:11:25 -04:00
LetterJay
c522e7a6e8 Merge pull request #3101 from Citadel-Station-13/upstream-merge-31236 
[MIRROR] Monkey Cubes expanding will give the new monkey an attack log with their creator
 2017-10-03 20:11:13 -04:00
LetterJay
8fd4ca0fe4 Merge pull request #3100 from Citadel-Station-13/upstream-merge-31252 
[MIRROR] Partial revert of #30763 (datum config refactor)
 2017-10-03 20:10:56 -04:00