shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,487 Commits 5 Branches 0 Tags
b89142a35bc2ccc3008a3fc473f1ebe003ccde3b
Commit Graph
7487 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub b89142a35b Merge pull request #3471 from Citadel-Station-13/upstream-merge-31810 
[MIRROR] Fixes being able to pick up brass chairs
 2017-10-18 07:37:05 -04:00
CitadelStationBot 4dadbeaee8 Automatic changelog generation for PR #3470 [ci skip] 2017-10-18 06:36:57 -05:00
LetterJayandGitHub 481a3ef518 Merge pull request #3470 from Citadel-Station-13/upstream-merge-31788 
[MIRROR] Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles.
 2017-10-18 07:36:55 -04:00
CitadelStationBot 19379b3db8 Automatic changelog generation for PR #3469 [ci skip] 2017-10-18 06:36:47 -05:00
LetterJayandGitHub 9e5c84372a Merge pull request #3469 from Citadel-Station-13/upstream-merge-31793 
[MIRROR] Fixes slapper inhand
 2017-10-18 07:36:45 -04:00
CitadelStationBot 6ec06cfefb Automatic changelog generation for PR #3467 [ci skip] 2017-10-18 06:36:33 -05:00
LetterJayandGitHub 6fe6c4ca63 Merge pull request #3467 from Citadel-Station-13/upstream-merge-31803 
[MIRROR] Fixes disabling leg actuators not setting power drain per step to the correct value
 2017-10-18 07:36:31 -04:00
CitadelStationBot 092958fa1f Automatic changelog generation for PR #3466 [ci skip] 2017-10-18 06:35:47 -05:00
LetterJayandGitHub 5bfabefc84 Merge pull request #3466 from Citadel-Station-13/upstream-merge-31806 
[MIRROR] Fixes for Smoke Machine Fixes
 2017-10-18 07:35:46 -04:00
CitadelStationBot 9a0418132b Automatic changelog generation for PR #3463 [ci skip] 2017-10-18 06:35:36 -05:00
LetterJayandGitHub 93e6e4a798 Merge pull request #3463 from Citadel-Station-13/upstream-merge-31784 
[MIRROR] Next round of shuttle fixes at the cost of a small piece of my sanity
 2017-10-18 07:35:34 -04:00
LetterJayandGitHub 271a287b52 Merge pull request #3461 from Citadel-Station-13/upstream-merge-31795 
[MIRROR] Random runtime fixes.
 2017-10-18 07:35:03 -04:00
CitadelStationBot 9ef4ae7671 Automatic changelog generation for PR #3460 [ci skip] 2017-10-18 06:34:54 -05:00
LetterJayandGitHub 47fa7b353c Merge pull request #3460 from Citadel-Station-13/upstream-merge-31800 
[MIRROR] Fixes automatic fire on guns
 2017-10-18 07:34:53 -04:00
LetterJayandGitHub bab51df97e Merge pull request #3459 from Citadel-Station-13/upstream-merge-31782 
[MIRROR] Corrects soil description
 2017-10-18 07:34:37 -04:00
CitadelStationBot 2fba7a240b Automatic changelog generation for PR #3458 [ci skip] 2017-10-18 06:34:29 -05:00
LetterJayandGitHub ad35b9f65c Merge pull request #3458 from Citadel-Station-13/upstream-merge-31792 
[MIRROR] Corrects caravan ambush tool speed
 2017-10-18 07:34:27 -04:00
CitadelStationBotandPoojawa 7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472) 
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
 2017-10-17 22:18:19 -05:00
CitadelStationBot 65c26fb486 Fixes being able to pick up brass chairs 2017-10-17 15:33:23 -05:00
Ashe HiggsandCitadelStationBot 13d8414369 Fixes being able to pick up brass chairs (#31810) 2017-10-17 15:33:23 -05:00
CitadelStationBot 1144d5f1a8 Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. 2017-10-17 13:37:26 -05:00
ShizCalevandCitadelStationBot 272fcc0b5d Stops plating subtypes from stating it has holes for rods & you can now only build ontop of it with tiles. (#31788) 
* Stops plating types from stating rod holes

* More immersion. Stops building ontop with rods.
 2017-10-17 13:37:25 -05:00
CitadelStationBot 197af627df Fixes slapper inhand 2017-10-17 13:36:17 -05:00
ShizCalevandCitadelStationBot bcb077a526 Fixes slapper inhand (#31793) 2017-10-17 13:36:17 -05:00
CitadelStationBot bd2d42bce4 Fixes disabling leg actuators not setting power drain per step to the correct value 2017-10-17 13:34:53 -05:00
Y0SH1M4S73RandCitadelStationBot 5b57ba97ac Fixes disabling leg actuators not setting power drain per step to the correct value (#31803) 
* Adds the normal_step_energy_drain var to mechs

* Disabling leg overload sets step_energy_drain to normal_step_energy_drain instead of calling initial
 2017-10-17 13:34:53 -05:00
CitadelStationBot 45b6744417 Fixes for Smoke Machine Fixes 2017-10-17 12:34:28 -05:00
RobustinandCitadelStationBot d8ab924b72 Smoke Machine Fixes (#31806) 2017-10-17 12:34:28 -05:00
CitadelStationBot 1be934c109 Next round of shuttle fixes at the cost of a small piece of my sanity 2017-10-17 12:00:46 -05:00
Emmett GainesandCitadelStationBot 8a336215f1 Next round of shuttle fixes at the cost of a small piece of my sanity (#31784) 
* shuttle bugs begone

* cleanup
 2017-10-17 12:00:46 -05:00
CitadelStationBot ef88abd85d Random runtime fixes. 2017-10-17 09:20:56 -05:00
LeoandCitadelStationBot 88486f97ca Merge pull request #31795 from AnturK/random-runtimes 
Random runtime fixes.
 2017-10-17 09:20:55 -05:00
CitadelStationBot 57b5b6c243 Fixes automatic fire on guns 2017-10-17 09:19:42 -05:00
LeoandCitadelStationBot a9389f4099 Merge pull request #31800 from DaxDupont/500hours 
Fixes automatic fire on guns
 2017-10-17 09:19:42 -05:00
CitadelStationBot 9691c9130f Automatic changelog generation for PR #3447 [ci skip] 2017-10-17 09:18:57 -05:00
LetterJayandGitHub bdbf1f509a Merge pull request #3447 from Citadel-Station-13/upstream-merge-31775 
[MIRROR] lowers portable pump max pressure to 25 atm
 2017-10-17 10:18:55 -04:00
CitadelStationBot 1cc1a22ba6 Automatic changelog generation for PR #3457 [ci skip] 2017-10-17 09:00:14 -05:00
LetterJayandGitHub 875d805403 Merge pull request #3457 from Citadel-Station-13/CWCIcons 
Fixes missing CWC icons
 2017-10-17 10:00:12 -04:00
CitadelStationBot 6a64ccf2e7 Corrects soil description 2017-10-17 08:23:21 -05:00
ShizCalevandCitadelStationBot 77ae7b7724 Corrects soil description 2017-10-17 08:23:21 -05:00
CitadelStationBot 9dc849a674 Corrects caravan ambush tool speed 2017-10-17 08:22:08 -05:00
ShizCalevandCitadelStationBot d43de80540 Corrects caravan ambush tool speed (#31792) 
* Corrects caravan ambush tool speed

* subtype
 2017-10-17 08:22:07 -05:00
LetterJayandGitHub 9a90445554 Merge pull request #3455 from Citadel-Station-13/upstream-merge-31660 
[MIRROR] Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities
 2017-10-17 08:59:28 -04:00
CitadelStationBot 7ee30feb18 Automatic changelog generation for PR #3454 [ci skip] 2017-10-17 07:59:21 -05:00
LetterJayandGitHub d6daa8b3e9 Merge pull request #3454 from Citadel-Station-13/upstream-merge-31699 
[MIRROR] Increasew the size of the katana from normal to huge
 2017-10-17 08:59:20 -04:00
CitadelStationBot f8abedde26 Automatic changelog generation for PR #3453 [ci skip] 2017-10-17 07:58:41 -05:00
LetterJayandGitHub dc17bfd316 Merge pull request #3453 from Citadel-Station-13/upstream-merge-31750 
[MIRROR] Prevent creampie overlays from stacking.
 2017-10-17 08:58:39 -04:00
LetterJayandGitHub e3922656fc Merge pull request #3452 from Citadel-Station-13/upstream-merge-31761 
[MIRROR] obj_break() will always be called before obj_destruction()
 2017-10-17 08:58:20 -04:00
CitadelStationBot 8cb9316afa Automatic changelog generation for PR #3451 [ci skip] 2017-10-17 07:58:12 -05:00
LetterJayandGitHub db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00