shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,165 Commits 5 Branches 0 Tags
7baccb8b85ffca86c37cb905fe5ca281a656d268
Commit Graph

84 Commits

Author SHA1 Message Date
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
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
CitadelStationBot
16ffd5f8dd Ghosts fresh clones instantly instead of waiting 2017-04-26 17:15:51 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
cea81a3357 Initialize Refactor 2017-04-26 16:03:17 -05:00
CitadelStationBot
a905c15dad Replaces /image with /mutable_appearance (#556) 
* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
 2017-04-26 08:18:35 -05:00
CitadelStationBot
45e9b1644e Gas injectors are now buildable 2017-04-26 04:35:40 -05:00
CitadelStationBot
fc0ff20e75 Dance Machine ~Fixes~ 2017-04-25 15:14:54 -05:00
LetterJay
a06c6a2994 Merge pull request #508 from Citadel-Station-13/upstream-merge-26337 
[MIRROR] Refactors picture frames to use wall frames system
 2017-04-25 01:10:40 -05:00
CitadelStationBot
5ed06c2e63 Doors crushing people makes a visible message 2017-04-24 18:02:03 -05:00
LetterJay
a6f6317b51 Merge pull request #535 from Citadel-Station-13/upstream-merge-26478 
[MIRROR] Fixes linking of multiple comm equipment with same id.
 2017-04-24 16:49:35 -05:00
LetterJay
2c01d8b5d9 Merge pull request #532 from Citadel-Station-13/upstream-merge-26381 
[MIRROR] Adds examine tips to firedoor construction/deconstruction
 2017-04-24 16:48:18 -05:00
CitadelStationBot
2af5d315a0 Fixes linking of multiple comm equipment with same id. 2017-04-24 13:14:16 -05:00
CitadelStationBot
c545d4801e Adds examine tips to firedoor construction/deconstruction 2017-04-24 07:45:06 -05:00
CitadelStationBot
de50b582ae Braining/debraining fixes 2017-04-23 14:48:31 -05:00
LetterJay
47f078ee2b Merge pull request #514 from Citadel-Station-13/upstream-merge-26332 
[MIRROR] Heinious spawn
 2017-04-22 14:40:10 -05:00
CitadelStationBot
e2c2d11e4f Heinious spawn 2017-04-22 09:37:35 -05:00
CitadelStationBot
5174e31b15 Fixes fuel checks being too early in weldering airlocks 2017-04-21 20:54:05 -05:00
CitadelStationBot
05d8550771 Refactors picture frames to use wall frames system 2017-04-21 17:54:34 -05:00
CitadelStationBot
a7f6c44681 Fixes DVIEW runtimes in preferences. (#490) 2017-04-20 22:01:29 -05:00
CitadelStationBot
3f6d0f2647 Fixes proximity monitor runtimes 2017-04-18 11:07:54 -05:00
CitadelStationBot
64068fc614 Proximity sensing refactor (#425) 2017-04-16 18:15:29 -04:00