shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,898 Commits 5 Branches 0 Tags
5b61c84df40733a1de10c693d5467226e3aa72ed
Commit Graph
4898 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan BrownandCitadelStationBot 5b61c84df4 Merge pull request #30481 from YPOQ/shuntfix 
Placing a robotics factory actually disables shunting
 2017-09-08 21:25:28 -05:00
CitadelStationBotandPoojawa d35717e1ab [MIRROR] Fixes assault pod blinking docking effects (#2667) 
* Fixes assault pod blinking docking effects (#30492)

* Fixes assault pod blinking docking effects
 2017-09-08 20:15:10 -05:00
PoojawaandGitHub ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654) 
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
 2017-09-08 06:58:08 -05:00
PoojawaandGitHub ed4488bd1d cleans merge conflict mess of #2638 (#2639) 2017-09-08 06:55:51 -05:00
PoojawaandGitHub 50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -05:00
CitadelStationBot 7155e1c631 Automatic changelog generation for PR #2651 [ci skip] 2017-09-07 16:17:35 -05:00
LetterJayandGitHub a806ecad19 Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486 
[MIRROR] Fixes goliath butchering
 2017-09-07 15:57:03 -05:00
LetterJayandGitHub d5c4f6e62d Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451 
[MIRROR] Disablers and ions wont burn plasma statues statues
 2017-09-07 15:55:04 -05:00
LetterJayandGitHub 93a98c000b Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460 
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
 2017-09-07 15:54:49 -05:00
LetterJayandGitHub 217e077342 Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469 
[MIRROR] Fixes containment field CanPass
 2017-09-07 15:54:34 -05:00
LetterJayandGitHub 82cfa67581 Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233 
[MIRROR] Adds a message when trying to move while buckled
 2017-09-07 15:53:38 -05:00
CitadelStationBot 99aa3a9217 Fixes goliath butchering 2017-09-07 11:58:42 -05:00
LetterJayandCitadelStationBot ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
CitadelStationBot df50c6b57b Disablers and ions wont burn plasma statues statues 2017-09-07 10:34:45 -05:00
KorPhaeronandCitadelStationBot b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
CitadelStationBot 6521dfa216 You can't fly with hair on your wings [Bee Suit Hair Suffix Fix] 2017-09-07 10:34:36 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot b6eddd8845 ok 2017-09-07 10:34:36 -05:00
CitadelStationBot 2a0996b0af Fixes containment field CanPass 2017-09-07 10:34:11 -05:00
AnturKandCitadelStationBot df3b4c10bc Fixes containment field CanPass 2017-09-07 10:34:11 -05:00
LetterJayandGitHub c55ac69e4a Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458 
[MIRROR] Allows atmos techs to download the SM monitor
 2017-09-07 10:23:15 -05:00
LetterJayandGitHub 21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436 
[MIRROR] More timer debugging for the debug gods.
 2017-09-07 10:22:45 -05:00
CitadelStationBot c1ccc98513 Automatic changelog generation for PR #2642 [ci skip] 2017-09-07 10:22:19 -05:00
LetterJayandGitHub 9ca0d6588d Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400 
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
 2017-09-07 10:22:17 -05:00
LetterJayandGitHub 8d854a53d8 Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426 
[MIRROR] Fixes swarmers breaking the SM's containment
 2017-09-07 10:21:57 -05:00
kingofkosmosandCitadelStationBot dd27a1850a Adds a message when trying to move while buckled 2017-09-07 10:12:32 -05:00
CitadelStationBot 06649108c5 Adds a unique suicide to the hierophant club, plus some attack verbs 2017-09-07 10:01:55 -05:00
Ashe HiggsandCitadelStationBot 938c10ad1c Adds a unique suicide to the hierophant club, plus some attack verbs (#30400) 
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
 2017-09-07 10:01:55 -05:00
CitadelStationBot 73aaf8a90b Automatic changelog generation for PR #2608 [ci skip] 2017-09-07 10:01:37 -05:00
LetterJayandGitHub 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
CitadelStationBot 393c4bb419 More timer debugging for the debug gods. 2017-09-07 09:59:29 -05:00
Kyle Spier-SwensonandCitadelStationBot 4b02f01a66 More timer debugging for the debug gods. (#30436) 
* More timer debugging for the debug gods.

* Its times like this I wish I could amend commit from the web interface

* git commit -a -amend&&git push --force
 2017-09-07 09:59:28 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJayandGitHub 2768aa68f9 Merge pull request #2638 from Citadel-Station-13/upstream-merge-30441 
[MIRROR] Fixes tgstation-server autotagging
 2017-09-07 07:37:40 -05:00
LetterJay eee21d496d oops 2017-09-07 07:23:52 -05:00
LetterJay 2ec925f66b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-07 07:21:56 -05:00
LetterJay b5d80219ac donation item 2017-09-07 07:21:42 -05:00
LetterJayandGitHub 766fa16b67 Merge pull request #2612 from Citadel-Station-13/upstream-merge-30431 
[MIRROR] Make add_details faster and fix the lag. (maybe)
 2017-09-07 06:48:14 -05:00
CitadelStationBot 3379cb9427 Automatic changelog generation for PR #2632 [ci skip] 2017-09-07 06:26:53 -05:00
LetterJayandGitHub 1162edad65 Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452 
[MIRROR] Alters the pressure plate crafting recipe
 2017-09-07 06:26:51 -05:00
LetterJay be65159138 fixes donation cloak 2017-09-07 06:11:20 -05:00
Jordan BrownandCitadelStationBot 34315805ba Fixes tgstation-server autotagging 2017-09-07 05:20:03 -05:00
CitadelStationBot 13a1eb5742 Fixes swarmers breaking the SM's containment 2017-09-07 05:17:51 -05:00
ShizCalevandCitadelStationBot 7fb4426011 Fixes swarmers breaking the SM's containment (#30426) 
* Fixes swamers breaking the SM

* Switched checks to use get_area
 2017-09-07 05:17:51 -05:00
CitadelStationBotandkevinz000 f7ed0b2165 CERESTATION DOES NOT EXIST, COMRADE. (#2618) 2017-09-06 21:40:17 -07:00
LetterJayandGitHub 5829f56727 Merge pull request #2531 from Citadel-Station-13/upstream-merge-30176 
[MIRROR] Adds more round id tracking
 2017-09-06 21:31:28 -05:00
LetterJayandGitHub 3c1bce5c21 Update merge-upstream-pull-request.sh 2017-09-06 21:20:29 -05:00
CitadelStationBot 749bb70d72 Allows atmos techs to download the SM monitor 2017-09-06 21:00:25 -05:00
ShizCalevandCitadelStationBot 4282d82e33 Allows atmos techs to download the SM monitor (#30458) 2017-09-06 21:00:25 -05:00
CitadelStationBot 7f07205de3 Alters the pressure plate crafting recipe 2017-09-06 20:35:50 -05:00
AnonmareandCitadelStationBot ee41b3da6f Alters the pressure plate crafting recipe (#30452) 2017-09-06 20:35:50 -05:00