shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,398 Commits 5 Branches 0 Tags
014aeb534cba11ed688f39d48c05a1558eb0183b
Commit Graph
13398 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 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
deathride58andGitHub 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
vuonojenmustaturskaandCitadelStationBot 56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 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 BrownandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub bf84d1502b Merge pull request #5365 from Citadel-Station-13/upstream-merge-35399 
[MIRROR] [s]Closes exploits in proc calling admin datum procs.
 2018-02-08 07:10:55 -06:00
LetterJayandGitHub 4a5468622a Merge pull request #5364 from Citadel-Station-13/upstream-merge-35401 
[MIRROR] [s]Closes exploits in proc calling admin rank datum procs.
 2018-02-08 07:10:42 -06:00
CitadelStationBot 468e67189e Fix intendation on embedding datum initializer 2018-02-08 04:59:18 -06:00
vuonojenmustaturskaandCitadelStationBot 79a4b9be58 Fix intendation on embedding datum initializer (#35447) 2018-02-08 04:59:18 -06:00
CitadelStationBot fdbc58a15c Adds basic trailer support to vehicles 2018-02-08 03:22:07 -06:00
IamgoofballandCitadelStationBot 1cc72fb3d4 Adds basic trailer support to vehicles (#35388) 
* Adds basic trailer support to vehicles

* Move compat.
 2018-02-08 03:22:07 -06:00
CitadelStationBot 2f0a0f3497 Removes an unnecessary type check from autolathe attackby 2018-02-08 03:19:50 -06:00
orangesandCitadelStationBot 39b6d1fb49 Merge pull request #35398 from ACCount12/pr_atomization 
Removes an unnecessary type check from autolathe attackby
 2018-02-08 03:19:50 -06:00
CitadelStationBot 527222e031 SM can explode on space tiles again 2018-02-08 03:13:28 -06:00
Dax DupontandCitadelStationBot 6dc78e0201 SM can explode on space tiles again (#35275) 
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
 2018-02-08 03:13:28 -06:00
CitadelStationBot 11518a644c Circuit drone + grabber/thrower balance changes 2018-02-08 03:11:12 -06:00
Evsey AntonovichandCitadelStationBot c066120fc0 Circuit drone + grabber/thrower balance changes (#34834) 
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
 2018-02-08 03:11:12 -06:00
CitadelStationBot cbe5a42dda Fixes cyborg related cuffing issues 2018-02-08 03:07:52 -06:00
orangesandCitadelStationBot d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs 
Fixes cyborg related cuffing issues
 2018-02-08 03:07:51 -06:00
CitadelStationBot 7af7100e46 Heart Disease 2: Electric Boogaloo 2018-02-08 03:02:30 -06:00
MoreRobustThanYouandCitadelStationBot 9c957f5a0b Heart Disease 2: Electric Boogaloo (#35296) 
* Heart Disease 2: Electric Boogaloo

* Upd8
 2018-02-08 03:02:29 -06:00
CitadelStationBot 7402b9f48a [s]Closes exploits in proc calling admin datum procs. 2018-02-08 02:55:07 -06:00
Kyle Spier-SwensonandCitadelStationBot 06a1d39595 [s]Closes exploits in proc calling admin datum procs. (#35399) 
* Closes exploits in proc calling admin datum procs.

There is likely one in ranks, but that can be its own pr.

* Update holder2.dm
 2018-02-08 02:55:07 -06:00
CitadelStationBot 219fb6c3ca [s]Closes exploits in proc calling admin rank datum procs. 2018-02-08 02:54:55 -06:00
orangesandCitadelStationBot 76ec67f246 Merge pull request #35401 from MrStonedOne/patch-475 
[s]Closes exploits in proc calling admin rank datum procs.
 2018-02-08 02:54:55 -06:00
CitadelStationBot 592a527c24 Automatic changelog generation for PR #5363 [ci skip] 2018-02-08 00:30:50 -06:00
LetterJayandGitHub 6043f3a852 Merge pull request #5363 from Citadel-Station-13/upstream-merge-35409 
[MIRROR] Belts now have inhand sprites
 2018-02-08 00:30:48 -06:00
CitadelStationBot ef1ffa5ac0 Automatic changelog generation for PR #5362 [ci skip] 2018-02-08 00:30:33 -06:00
LetterJayandGitHub c8b7e5dc7a Merge pull request #5362 from Michiyamenotehifunana/nekomimi-port 
Ports TG's nekomimi to Cit's mammal sprite accessories system
 2018-02-08 00:30:31 -06:00