shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,424 Commits 5 Branches 0 Tags
1d63b0bc6fe2fdf2b4eb21cdede16baa2e98002d
Commit Graph

13424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 1d63b0bc6f Cell blueprints now use the /empty variants 2018-02-09 12:50:46 -06:00
Jordan Brown 38fe1ac2fe Cell blueprints now use the /empty variants (#35463) 
* Cell blueprints now use the /empty variants

* Add empty stock cell
 2018-02-09 12:50:46 -06:00
CitadelStationBot 70c4799ce3 sm 2018-02-09 11:11:09 -05:00
CitadelStationBot dab6356598 Automatic changelog generation for PR #5323 [ci skip] 2018-02-09 07:47:11 -06:00
CitadelStationBot 85c2f56beb Merge pull request #5323 from Raeschen/Raes_miscreanttweak 
Changed/removed some miscreant objectives.
 2018-02-09 07:47:09 -06:00
CitadelStationBot b31bfc0ca6 Automatic changelog generation for PR #5384 [ci skip] 2018-02-09 07:46:30 -06:00
CitadelStationBot 8fb72176be Merge pull request #5384 from deathride58/iamgoingtoregretthis 
Makes input boxes for emotes larger.
 2018-02-09 07:46:28 -06:00
CitadelStationBot 6a8994345f Automatic changelog generation for PR #5378 [ci skip] 2018-02-09 07:46:21 -06:00
CitadelStationBot 9eceb5c249 Merge pull request #5378 from improvedname/bunnypack 
Adds improved's donator item carrot satchel.
 2018-02-09 07:46:18 -06:00
Nick 8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname d2404d3cf7 has 2018-02-09 07:09:10 +01:00
CitadelStationBot 90b924445a Automatic changelog generation for PR #5379 [ci skip] 2018-02-08 21:01:10 -06:00
deathride58 3fb0579762 Merge pull request #5379 from Citadel-Station-13/upstream-merge-35426 
[MIRROR] adds italian moustache that makes you italian
 2018-02-09 03:01:08 +00:00
deathride58 832ac9a64a makes emote input text boxes larger 2018-02-08 21:47:29 -05:00
deathride58 bf33dadc0b Merge pull request #5383 from Citadel-Station-13/upstream-merge-35428 
[MIRROR] Atom initialization counter only shows up in TESTING mode
 2018-02-09 01:30:03 +00:00
deathride58 6b747cf50a Merge pull request #5380 from Citadel-Station-13/upstream-merge-35419 
[MIRROR] fixes beam rifle zooming
 2018-02-09 01:29:46 +00:00
deathride58 2d488148c7 Update genetics.dm 2018-02-08 20:27:46 -05:00
CitadelStationBot 9a0c818cd8 Atom initialization counter only shows up in TESTING mode 2018-02-08 16:12:53 -06:00
Jordan Brown 5a3b322d43 Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 16:12:53 -06:00
CitadelStationBot ccf1c95c1a fixes beam rifle zooming 2018-02-08 15:18:40 -06:00
Jordan Brown 623513ab24 Merge pull request #35419 from kevinz000/patch-446 
fixes beam rifle zooming
 2018-02-08 15:18:40 -06:00
PKPenguin321 bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
Improvedname 464077ef3a bunni 2018-02-08 20:31:26 +01:00
CitadelStationBot 99c42a142c Automatic changelog generation for PR #5377 [ci skip] 2018-02-08 12:57:07 -06:00
deathride58 014aeb534c Merge pull request #5377 from Citadel-Station-13/upstream-merge-35423 
[MIRROR] Fixes geiger counters on engiborgs
 2018-02-08 18:57:04 +00:00
deathride58 329f70139c RESETS AGE_MIN TO 18 2018-02-08 13:56:38 -05:00
CitadelStationBot 713398736c Fixes geiger counters on engiborgs 2018-02-08 11:21:27 -06:00
vuonojenmustaturska 56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
deathride58 3762b9c474 Merge pull request #5376 from Citadel-Station-13/upstream-merge-35410 
[MIRROR] Fixes primary AI spawning at incorrect locations
 2018-02-08 16:26:33 +00:00
deathride58 4312966f77 Merge pull request #5375 from Citadel-Station-13/upstream-merge-35418 
[MIRROR] Allows projectiles to pass portals
 2018-02-08 16:26:14 +00:00
CitadelStationBot d94957b007 Automatic changelog generation for PR #5374 [ci skip] 2018-02-08 10:25:32 -06:00
deathride58 83b0a656ea Merge pull request #5374 from Citadel-Station-13/upstream-merge-35412 
[MIRROR] Brings certain designs in line with others.
 2018-02-08 16:25:30 +00:00
CitadelStationBot decbdd70a7 Fixes primary AI spawning at incorrect locations 2018-02-08 09:06:14 -06:00
Jordan Brown 28fe3df885 Merge pull request #35410 from ShizCalev/ai-loc-fix 
Fixes primary AI spawning at incorrect locations
 2018-02-08 09:06:14 -06:00
CitadelStationBot 76c73d544b Allows projectiles to pass portals 2018-02-08 09:05:02 -06:00
Jordan Brown 6f60dd1591 Merge pull request #35418 from kevinz000/patch-445 
Allows projectiles to pass portals
 2018-02-08 09:05:02 -06:00
CitadelStationBot c68a2f652c Brings certain designs in line with others. 2018-02-08 09:04:46 -06:00
Jordan Brown ee77e12bca Merge pull request #35412 from DaxDupont/flags-are-for-fags 
Brings certain designs in line with others.
 2018-02-08 09:04:46 -06:00
CitadelStationBot b363799535 cl 2018-02-08 08:14:54 -05:00
LetterJay 69f62c75db Merge pull request #5372 from Citadel-Station-13/upstream-merge-35447 
[MIRROR] Fix intendation on embedding datum initializer
 2018-02-08 07:13:11 -06:00
LetterJay 7a13591920 Merge pull request #5371 from Citadel-Station-13/upstream-merge-35388 
[MIRROR] Adds basic trailer support to vehicles
 2018-02-08 07:13:04 -06:00
LetterJay f5666c115a Merge pull request #5370 from Citadel-Station-13/upstream-merge-35398 
[MIRROR] Removes an unnecessary type check from autolathe attackby
 2018-02-08 07:12:48 -06:00
CitadelStationBot 491caa044a Automatic changelog generation for PR #5369 [ci skip] 2018-02-08 07:12:35 -06:00
LetterJay e4319100b5 Merge pull request #5369 from Citadel-Station-13/upstream-merge-35275 
[MIRROR] SM can explode on space tiles again
 2018-02-08 07:12:32 -06:00
CitadelStationBot 27b361b8b4 Automatic changelog generation for PR #5368 [ci skip] 2018-02-08 07:12:15 -06:00
LetterJay e3067e835a Merge pull request #5368 from Citadel-Station-13/upstream-merge-34834 
[MIRROR] Circuit drone + grabber/thrower balance changes
 2018-02-08 07:12:13 -06:00
CitadelStationBot 6245d9dddb Automatic changelog generation for PR #5367 [ci skip] 2018-02-08 07:11:54 -06:00
LetterJay e548295398 Merge pull request #5367 from Citadel-Station-13/upstream-merge-35346 
[MIRROR] Fixes cyborg related cuffing issues
 2018-02-08 07:11:52 -06:00
CitadelStationBot 75a266ccad Automatic changelog generation for PR #5366 [ci skip] 2018-02-08 07:11:44 -06:00
LetterJay 35103d74bd Merge pull request #5366 from Citadel-Station-13/upstream-merge-35296 
[MIRROR] Heart Disease 2: Electric Boogaloo
 2018-02-08 07:11:42 -06:00