shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,687 Commits 5 Branches 0 Tags
986ea603e93bcd7a19e2d7b00a30ac75c1969362
Commit Graph

16687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58 986ea603e9 Merge pull request #6686 from Citadel-Station-13/upstream-merge-37719 
[MIRROR] [s] Fix wallets acting as though they still contain removed IDs
 2018-05-17 18:13:28 +00:00
deathride58 146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
deathride58 290a4ef1de Merge pull request #6757 from Citadel-Station-13/upstream-merge-37850 
[MIRROR] Fixes fireaxe butchering.
 2018-05-17 18:12:33 +00:00
CitadelStationBot 44ca1dd5b9 Automatic changelog generation for PR #6758 [ci skip] 2018-05-17 13:12:18 -05:00
deathride58 97b72c0289 Merge pull request #6758 from Citadel-Station-13/upstream-merge-37853 
[MIRROR] Fixes wrong circuits
 2018-05-17 18:12:16 +00:00
deathride58 baec90fe11 Merge pull request #6759 from Citadel-Station-13/upstream-merge-37840 
[MIRROR] Fixes meteors hitting qdeleted stuff.
 2018-05-17 18:11:57 +00:00
CitadelStationBot 39515a04e9 Automatic changelog generation for PR #6760 [ci skip] 2018-05-17 13:11:26 -05:00
deathride58 cee67a7706 Merge pull request #6760 from Citadel-Station-13/upstream-merge-37602 
[MIRROR] [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping
 2018-05-17 18:11:24 +00:00
CitadelStationBot 4e5514ff97 Automatic changelog generation for PR #6762 [ci skip] 2018-05-17 13:10:32 -05:00
deathride58 5398828bb9 Merge pull request #6762 from Citadel-Station-13/upstream-merge-37860 
[MIRROR] [s] Fixes bioware surgery exploit
 2018-05-17 18:10:29 +00:00
deathride58 583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863 
[MIRROR] Fixes changeling team objectives (a bit)
 2018-05-17 18:10:01 +00:00
deathride58 93a9afcf88 Merge pull request #6764 from Citadel-Station-13/upstream-merge-37839 
[MIRROR] Fixes minor cleanbot runtime.
 2018-05-17 18:09:31 +00:00
deathride58 5242d1ad4b Merge pull request #6768 from Citadel-Station-13/upstream-merge-37866 
[MIRROR] Client topics only check for deleted objects when an object was actually passed
 2018-05-17 18:09:00 +00:00
deathride58 cbac22ccb7 Merge pull request #6769 from Citadel-Station-13/upstream-merge-37868 
[MIRROR] Fixes parallax runtime
 2018-05-17 18:08:40 +00:00
CitadelStationBot aa1747bf07 Automatic changelog generation for PR #6771 [ci skip] 2018-05-17 13:08:25 -05:00
deathride58 b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872 
[MIRROR] Fixes Adminorazine killing ash lizards
 2018-05-17 18:08:16 +00:00
CitadelStationBot 98dba850da Automatic changelog generation for PR #6773 [ci skip] 2018-05-17 13:07:48 -05:00
deathride58 db6fdc0f48 Merge pull request #6773 from Citadel-Station-13/upstream-merge-37836 
[MIRROR] Circuit gun inhands and grabber fix
 2018-05-17 18:07:46 +00:00
deathride58 24d87f2884 Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871 
[MIRROR] Fixes sharp weapons deconverting revs
 2018-05-17 18:06:45 +00:00
CitadelStationBot c8fa81e395 Automatic changelog generation for PR #6775 [ci skip] 2018-05-17 13:06:28 -05:00
deathride58 d151f367cf Merge pull request #6775 from Citadel-Station-13/upstream-merge-37834 
[MIRROR] The crashed abductor ship is now fully deconstructable
 2018-05-17 18:06:26 +00:00
deathride58 df9184cce2 Merge pull request #6776 from Citadel-Station-13/upstream-merge-37887 
[MIRROR] Fixes vent_clog bad chem id runtime
 2018-05-17 18:06:05 +00:00
deathride58 31efb16a1e Merge pull request #6777 from Citadel-Station-13/upstream-merge-37888 
[MIRROR] Fixes container_resist runtimes
 2018-05-17 18:05:35 +00:00
letterjay 3e99f73249 Fixes container_resist runtimes 2018-05-17 10:57:49 -05:00
ShizCalev 0e819cb1fc Fixes container_resist runtimes (#37888) 2018-05-17 10:57:48 -05:00
letterjay eb84f2dde0 Fixes vent_clog bad chem id runtime 2018-05-17 10:56:35 -05:00
ShizCalev 394fbf09e3 Fixes vent_clog bad chem id runtime (#37887) 
* Fixes vent_clog bad chem id runtime

* sodiumchloride
 2018-05-17 10:56:35 -05:00
letterjay 7ffc7e2b33 The crashed abductor ship is now fully deconstructable 2018-05-17 10:32:55 -05:00
iksyp 8dab7deb9a The crashed abductor ship is now fully deconstructable (#37834) 
* walls

*abductor lavaland ruin walls are now destructible

* just fucking uglify it

it saves me the hassle of having to subtype
 2018-05-17 10:32:55 -05:00
letterjay a9664ac343 Fixes sharp weapons deconverting revs 2018-05-17 10:28:38 -05:00
ShizCalev e425a8514e Fixes sharp weapons deconverting revs (#37871) 
* Fixes sharp weapons deconverting revs

* enhanced commentary
 2018-05-17 10:28:38 -05:00
letterjay f0f2ca75c9 Circuit gun inhands and grabber fix 2018-05-17 10:27:25 -05:00
Trevor Serpas 61e1529e18 Circuit gun inhands and grabber fix (#37836) 
* Grabbers update when a thrower uses its inventory and throwers and gun circuits need to use the gun assembly

* visible_messages
 2018-05-17 10:27:25 -05:00
letterjay ea8cd1f16f Fixes Adminorazine killing ash lizards 2018-05-17 10:24:59 -05:00
ShizCalev a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) 
* Fixes Adminorazine killing ash lizards

* this should do it...
 2018-05-17 10:24:59 -05:00
letterjay 08f00022f8 Fixes parallax runtime 2018-05-17 10:17:26 -05:00
CitrusGender a00fc47d1e Update parallax.dm (#37868) 
removes the parallelx runtimes
 2018-05-17 10:17:26 -05:00
letterjay 05426ad041 Client topics only check for deleted objects when an object was actually passed 2018-05-17 10:15:12 -05:00
Kyle Spier-Swenson 085066d555 Client topics only check for deleted objects when an object was actually passed (#37866) 2018-05-17 10:15:12 -05:00
letterjay 1b592ba4db Fixes minor cleanbot runtime. 2018-05-16 14:37:03 -05:00
vuonojenmustaturska 7429a7ef6a Merge pull request #37839 from AnturK/rr1 
Fixes minor cleanbot runtime.
 2018-05-16 14:37:03 -05:00
letterjay db93253168 Fixes changeling team objectives (a bit) 2018-05-16 14:35:49 -05:00
vuonojenmustaturska aa7a27420c Merge pull request #37863 from AnturK/rr4 
Fixes changeling team objectives (a bit)
 2018-05-16 14:35:49 -05:00
letterjay 46dcabfed0 [s] Fixes bioware surgery exploit 2018-05-16 14:34:36 -05:00
Dax Dupont 48c37df7cd [s] Fixes bioware surgery exploit (#37860) 
* Fixes bioware surgery

* my ass must blast
 2018-05-16 14:34:36 -05:00
81Denton 0333a50552 [Ready] Syndie air alarm/APC subtypes, cleaning up syndie lavaland piping 2018-05-16 12:18:36 -05:00
LetterJay 8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
letterjay 4879701b19 Fixes meteors hitting qdeleted stuff. 2018-05-16 12:06:06 -05:00
AnturK b111088140 Fixes meteors hitting qdeleted stuff. (#37840) 
* Fixes meteors hitting qdeleted stuff.

* I made a typo in one line change, time to die.

* Better solution ?
 2018-05-16 12:06:06 -05:00
letterjay 7c0182da95 Fixes wrong circuits 2018-05-16 12:04:54 -05:00