shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,762 Commits 5 Branches 0 Tags
ec4ebd2e3ced237dc0ee870165945bb57faa34fb
Commit Graph

12762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vuonojenmustaturska
ec4ebd2e3c Merge pull request #34952 from ninjanomnom/its-hard-to-see-under-the-wraps 
Left out a closing parenthesis in LERP
 2018-01-26 18:04:05 -06:00
CitadelStationBot
57cfc1c81e Automatic changelog generation for PR #5015 [ci skip] 2018-01-26 10:50:10 -06:00
cebutris
b2a5caa5ba Lavaknights now get polychromatic ID badges [READY!] (#5015) 
* adds IDs to cammy's catknights

* sets the ID as a subtype for easier asset changing

* Makes lavaknight captains more captain-y

* icons!

* It's okay I'm only mildly an idiot

* Knight Badges are called Knight Badges

* Polychromes them hecking badges

* Polychromes them hecking badges

* Makes them work!

* moves the id to their own file

* how did I fucking miss this am I just that much of an idiot

* removes unnecessary copypaste

* they're not id cards i swear
 2018-01-26 10:50:08 -06:00
CitadelStationBot
e8b7c708bd Automatic changelog generation for PR #5119 [ci skip] 2018-01-26 09:55:32 -06:00
deathride58
acb7d1827b Merge pull request #5119 from Citadel-Station-13/upstream-merge-34884 
[MIRROR] Fixes pneumatic cannon contents deletion
 2018-01-26 15:55:30 +00:00
CitadelStationBot
c4fc07c561 Automatic changelog generation for PR #5116 [ci skip] 2018-01-26 09:55:12 -06:00
deathride58
b0712e4892 Merge pull request #5116 from Citadel-Station-13/upstream-merge-34915 
[MIRROR] Fixed the simple rotation component
 2018-01-26 15:55:10 +00:00
CitadelStationBot
89ebb357eb Automatic changelog generation for PR #5115 [ci skip] 2018-01-26 09:54:49 -06:00
deathride58
0dcb98f754 Merge pull request #5115 from Citadel-Station-13/upstream-merge-34918 
[MIRROR] Correct spelling of armament
 2018-01-26 15:54:46 +00:00
CitadelStationBot
f1f7255dcc Automatic changelog generation for PR #5114 [ci skip] 2018-01-26 09:54:27 -06:00
deathride58
86fa4871a6 Merge pull request #5114 from Citadel-Station-13/upstream-merge-34910 
[MIRROR] Fixes Ketrazine recipe
 2018-01-26 15:54:25 +00:00
CitadelStationBot
0704f612a0 Automatic changelog generation for PR #5112 [ci skip] 2018-01-26 09:53:17 -06:00
deathride58
870f2320b5 Merge pull request #5112 from Citadel-Station-13/upstream-merge-34906 
[MIRROR] Removes Sulfuric Acid requirements from computer parts
 2018-01-26 15:53:14 +00:00
deathride58
d8434f2b4a Merge pull request #5111 from Citadel-Station-13/upstream-merge-34904 
[MIRROR] fixes pancake runtimes
 2018-01-26 15:52:55 +00:00
deathride58
ebfa263653 Merge pull request #5110 from Citadel-Station-13/upstream-merge-34897 
[MIRROR] Fixes orbiting stopping when entering disposals
 2018-01-26 15:52:39 +00:00
deathride58
3c017a55ec Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891 
[MIRROR] Fixes airlocks playing closing sound while already closed
 2018-01-26 15:50:57 +00:00
CitadelStationBot
1339781092 Automatic changelog generation for PR #5107 [ci skip] 2018-01-26 09:50:41 -06:00
deathride58
a539f6103a Merge pull request #5107 from Citadel-Station-13/upstream-merge-34881 
[MIRROR] Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 15:50:38 +00:00
CitadelStationBot
f6839c12d3 Automatic changelog generation for PR #5106 [ci skip] 2018-01-26 09:49:57 -06:00
deathride58
20eca7bc22 Merge pull request #5106 from Citadel-Station-13/upstream-merge-34852 
[MIRROR] Power Cell explosions are now log
 2018-01-26 15:49:55 +00:00
deathride58
ba98d2a7f1 Merge pull request #5105 from Citadel-Station-13/upstream-merge-34899 
[MIRROR] clear_zeroth_law sanity check
 2018-01-26 15:49:34 +00:00
deathride58
5e6000d02d Merge pull request #5104 from Citadel-Station-13/upstream-merge-34900 
[MIRROR] Syringe update_icon sanity
 2018-01-26 15:48:53 +00:00
deathride58
9118715588 Merge pull request #5103 from Citadel-Station-13/upstream-merge-34901 
[MIRROR] Fixes brains being left in hands after being inserted into heads
 2018-01-26 15:48:28 +00:00
CitadelStationBot
545d7ee3d8 Automatic changelog generation for PR #5102 [ci skip] 2018-01-26 09:47:58 -06:00
deathride58
5bc3ad8016 Merge pull request #5102 from Citadel-Station-13/upstream-merge-34876 
[MIRROR] Nuke op intelligence potions also grant an internal ID
 2018-01-26 15:47:56 +00:00
CitadelStationBot
be61d258b9 Automatic changelog generation for PR #5101 [ci skip] 2018-01-26 09:47:32 -06:00
deathride58
90611e16ed Merge pull request #5101 from Citadel-Station-13/upstream-merge-34873 
[MIRROR] Fixes Infinite Airlock Materials
 2018-01-26 15:47:29 +00:00
CitadelStationBot
26d070c56a Automatic changelog generation for PR #5090 [ci skip] 2018-01-26 09:44:25 -06:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
deathride58
4008898f54 Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829 
[MIRROR] Removes animation from photos
 2018-01-26 15:39:38 +00:00
CitadelStationBot
1f8c65e27d Fixes pneumatic cannon contents deletion 2018-01-26 04:37:38 -06:00
vuonojenmustaturska
5eb79ec417 Fixes pneumatic cannon contents deletion (#34884) 
* Fix pneumatic cannon contents deletion

* honk

* Update pneumaticCannon.dm
 2018-01-26 04:37:37 -06:00
CitadelStationBot
e4c2bb9d33 Fixed the simple rotation component 2018-01-26 03:01:11 -06:00
Jordan Brown
f703e0f8d8 Merge pull request #34915 from Cruix/flipstuff 
Fixed the simple rotation component
 2018-01-26 03:01:11 -06:00
CitadelStationBot
3415aa8710 Correct spelling of armament 2018-01-26 03:01:02 -06:00
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06:00
CitadelStationBot
4f3b7c633c Fixes Ketrazine recipe 2018-01-26 03:00:52 -06:00
Jordan Brown
5db9ca3085 Merge pull request #34910 from GuppyLaxx/idk 
Fixes Ketrazine recipe
 2018-01-26 03:00:52 -06:00
CitadelStationBot
7470164df4 Removes Sulfuric Acid requirements from computer parts 2018-01-26 03:00:32 -06:00
Jordan Brown
c381c639cb Merge pull request #34906 from epochayur/master 
Removes Sulfuric Acid requirements from computer parts
 2018-01-26 03:00:32 -06:00
CitadelStationBot
14d94d7a1f fixes pancake runtimes 2018-01-26 03:00:24 -06:00
Jordan Brown
2af5ee4cc5 Merge pull request #34904 from ShizCalev/pancake-length 
fixes pancake runtimes
 2018-01-26 03:00:24 -06:00
CitadelStationBot
bbb60a1b5a Fixes orbiting stopping when entering disposals 2018-01-26 03:00:16 -06:00
Jordan Brown
d0c648b702 Merge pull request #34897 from YPOQ/orbitfix 
Fixes orbiting stopping when entering disposals
 2018-01-26 03:00:16 -06:00
CitadelStationBot
87560a947e Fixes airlocks playing closing sound while already closed 2018-01-26 03:00:00 -06:00
Jordan Brown
fc5cf12523 Merge pull request #34891 from YPOQ/closesoundfix 
Fixes airlocks playing closing sound while already closed
 2018-01-26 03:00:00 -06:00
CitadelStationBot
6448ed5b64 Adds Pax to the Peacekeeper Borg's "Peace Hypospray" 2018-01-26 02:59:45 -06:00
Jordan Brown
f2d75f1439 Merge pull request #34881 from Robustin/paxPK 
Adds Pax to the Peacekeeper Borg's "Peace Hypospray"
 2018-01-26 02:59:45 -06:00
CitadelStationBot
b135ea7930 Power Cell explosions are now log 2018-01-26 02:59:37 -06:00
Jordan Brown
ffffd35345 Merge pull request #34852 from Iamgoofball/patch-376 
Power Cell explosions are now log
 2018-01-26 02:59:36 -06:00