shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,494 Commits 5 Branches 0 Tags
65fc23806b1e2af92b6f09781b9d107fff205de0
Commit Graph

104 Commits

Author SHA1 Message Date
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
kevinz000
035dd93158 Merge pull request #756 from Citadel-Station-13/upstream-merge-26848 
[MIRROR] Adds spewium toxin in traitor kits
 2017-05-06 21:43:08 -07:00
kevinz000
0e718e32cc Merge pull request #760 from Citadel-Station-13/upstream-merge-26804 
[MIRROR] Nuke op TC consoles can donate all TCs at once, and other small changes.
 2017-05-06 21:23:46 -07:00
kevinz000
329190d660 Merge pull request #809 from Citadel-Station-13/upstream-merge-26933 
[MIRROR] Makes medbay vending machines buildable
 2017-05-06 14:22:08 -07:00
kevinz000
28f6096503 Merge pull request #788 from Citadel-Station-13/upstream-merge-26911 
[MIRROR] Improves vending machine user feedback
 2017-05-06 13:59:05 -07:00
CitadelStationBot
30f7e170a3 Makes medbay vending machines buildable 2017-05-06 13:52:12 -05:00
kevinz000
62b8f929bb Merge pull request #746 from Citadel-Station-13/upstream-merge-26794 
[MIRROR] Turrets no longer target invisible creatures
 2017-05-06 11:39:01 -07:00
CitadelStationBot
0fb29b2650 Improves vending machine user feedback 2017-05-05 18:10:01 -05:00
LetterJay
c489186c3f message code 2017-05-05 10:38:03 -05:00
LetterJay
acf8cb1597 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876 2017-05-05 10:26:02 -05:00
LetterJay
1bb43eb7ae woo 2017-05-05 10:21:53 -05:00
LetterJay
caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743 
[MIRROR] Holocalls
 2017-05-05 10:19:28 -05:00
LetterJay
20f3280c96 this one time i ate boiled peanuts 2017-05-05 09:52:47 -05:00
CitadelStationBot
f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
CitadelStationBot
4140cffc98 Nuke op TC consoles can donate all TCs at once, and other small changes. 2017-05-04 18:08:14 -05:00
CitadelStationBot
46d7976488 Adds spewium toxin in traitor kits 2017-05-04 17:53:42 -05:00
CitadelStationBot
a54b541635 Turrets no longer target invisible creatures 2017-05-04 06:07:09 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
159f7f8d90 Merge pull request #602 from Citadel-Station-13/upstream-merge-26373 
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
 2017-05-02 11:14:14 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601 
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
 2017-05-02 11:10:13 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
CitadelStationBot
36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00
LetterJay
1842665af6 idjeet 2017-05-01 08:38:03 -05:00
LetterJay
3d6845675a Merge pull request #679 from Citadel-Station-13/upstream-merge-26709 
[MIRROR] Readds deepstorage w/ tweaks AND adds water bottles to vending machines
 2017-05-01 08:10:13 -05:00
LetterJay
442fef549e Merge pull request #664 from Citadel-Station-13/upstream-merge-26698 
[MIRROR] Message monitor fix + spawn kill
 2017-05-01 08:02:54 -05:00
LetterJay
647a9967ba Merge pull request #656 from Citadel-Station-13/upstream-merge-26538 
[MIRROR] Bank Machine now uses the radio rather than announcements
 2017-05-01 08:00:41 -05:00
LetterJay
e9dc5bcd95 Merge pull request #643 from Citadel-Station-13/upstream-merge-26643 
[MIRROR] Makes dance machine GBP requirements track-based instead of hardcoded
 2017-05-01 07:56:37 -05:00
LetterJay
f2af0cac91 Merge pull request #635 from Citadel-Station-13/upstream-merge-26602 
[MIRROR] Makes it less painful to add songs to the disco machine
 2017-05-01 07:43:27 -05:00
LetterJay
5b45983c4c Merge pull request #629 from Citadel-Station-13/upstream-merge-26654 
[MIRROR] Rechargers no longer flash the charged animation before charging
 2017-05-01 07:41:53 -05:00
CitadelStationBot
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
CitadelStationBot
87e306851d Readds deepstorage w/ tweaks AND adds water bottles to vending machines 2017-05-01 07:24:41 -05:00
CitadelStationBot
b2a5a9fad5 Message monitor fix + spawn kill 2017-04-30 11:22:17 -05:00
CitadelStationBot
e775ce3f35 Bank Machine now uses the radio rather than announcements 2017-04-29 16:58:04 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
CitadelStationBot
b7f125af9b Makes dance machine GBP requirements track-based instead of hardcoded 2017-04-28 21:07:20 -05:00
CitadelStationBot
307f7b001d Makes it less painful to add songs to the disco machine 2017-04-28 20:59:43 -05:00
CitadelStationBot
49c81c8a1d Rechargers no longer flash the charged animation before charging 2017-04-28 20:53:17 -05:00
CitadelStationBot
3cd889b8ce Language icons 2017-04-28 09:59:07 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
LetterJay
86353dc472 Merge pull request #584 from Citadel-Station-13/upstream-merge-26385 
[MIRROR] Ghosts fresh clones instantly instead of waiting
 2017-04-27 12:52:51 -05:00
LetterJay
cf41ec187a Merge pull request #592 from Citadel-Station-13/upstream-merge-26368 
[MIRROR] Changes all instances of "RD Console" to "R&D Console"
 2017-04-27 12:49:49 -05:00
CitadelStationBot
30f275d5f9 Fixes being unable to empty an emagged cloning pod via manual ejection. 2017-04-27 09:26:09 -05:00
CitadelStationBot
870ee9ca6c Minor IV/bloodbag grammar fixes 2017-04-27 09:21:57 -05:00
CitadelStationBot
27feafc699 Changes all instances of "RD Console" to "R&D Console" 2017-04-27 03:00:07 -05:00
CitadelStationBot
b45d053ac6 When jumpsuits take severe damage, their suit sensors break. 2017-04-27 02:32:35 -05:00