shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,185 Commits 5 Branches 0 Tags
8a221b96376abb7916103e02bb71d0fb65b60f96
Commit Graph

275 Commits

Author SHA1 Message Date
LetterJay
337e9ca937 Merge pull request #715 from Citadel-Station-13/upstream-merge-26769 
[MIRROR] Fixes proximity sensors not tracking correctly
 2017-05-02 18:45:21 -05:00
LetterJay
1eb0617037 Merge pull request #692 from Citadel-Station-13/upstream-merge-26738 
[MIRROR] Small fixes to spatial gateways
 2017-05-02 12:24:53 -05:00
LetterJay
fe5e1db512 Merge pull request #718 from Citadel-Station-13/upstream-merge-26765 
[MIRROR] Makes golems able to transfer into empty shells
 2017-05-02 12:24:24 -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
b4782e24af Merge pull request #636 from Citadel-Station-13/upstream-merge-26594 
[MIRROR] Blood Cult removals and tweaks
 2017-05-02 11:15: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
CitadelStationBot
25f1b24f62 Makes golems able to transfer into empty shells 2017-05-02 10:00:33 -05:00
CitadelStationBot
913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -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
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
a6263621e7 Merge pull request #688 from Citadel-Station-13/upstream-merge-26729 
[MIRROR] Gang Pen Is now Stealthy
 2017-05-02 03:03:43 -05:00
LetterJay
64fd72f1cf Update artefact.dm 2017-05-01 15:31:51 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
161891e51b conflict res 2017-05-01 15:26:17 -05:00
CitadelStationBot
faaf0c17ba Small fixes to spatial gateways 2017-05-01 11:39:13 -05:00
CitadelStationBot
242cc65eac Gang Pen Is now Stealthy 2017-05-01 11:05:28 -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
7261d61983 Merge pull request #672 from Citadel-Station-13/upstream-merge-26717 
[MIRROR] Moves antag datums to the mind
 2017-05-01 08:09:22 -05:00
LetterJay
03efaf3f13 Merge pull request #673 from Citadel-Station-13/upstream-merge-26718 
[MIRROR] Winter Wonderland holodeck no longer has freon, and it's no longer restricted
 2017-05-01 08:09:07 -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
3955c7da7d Merge pull request #651 from Citadel-Station-13/upstream-merge-26681 
[MIRROR] You can no longer spam-spawn scarabs via Ratvar
 2017-05-01 07:59:16 -05:00
LetterJay
7c02c0ef6a Merge pull request #649 from Citadel-Station-13/upstream-merge-26678 
[MIRROR] Ports chem grenades to Initialize
 2017-05-01 07:58:20 -05:00
LetterJay
817b259192 Merge pull request #648 from kevinz000/patch-2 
Gives help intent groin functionality to wicker dolls
 2017-05-01 07:58:09 -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
954b035868 Merge pull request #644 from Citadel-Station-13/upstream-merge-26651 
[MIRROR] Replaces Double Agents with Internal Affairs
 2017-05-01 07:56:17 -05:00
LetterJay
5cab328632 Merge pull request #638 from Citadel-Station-13/upstream-merge-26536 
[MIRROR] Nerfs and buffs The Traps
 2017-05-01 07:44:15 -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
c2b2b8c2a3 Merge pull request #634 from Citadel-Station-13/upstream-merge-26597 
[MIRROR] Tank suicide no longer gibs w/o enough pressure
 2017-05-01 07:43:17 -05:00
LetterJay
56b3d36521 Merge pull request #632 from Citadel-Station-13/upstream-merge-26611 
[MIRROR] Replaces Mending Motor with Mending Mantra
 2017-05-01 07:42:51 -05:00
LetterJay
652f124f98 Merge pull request #630 from Citadel-Station-13/upstream-merge-26659 
[MIRROR] Whisper() now has the same args as Say()
 2017-05-01 07:42:17 -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
0ae4f76fb9 Winter Wonderland holodeck no longer has freon, and it's no longer restricted 2017-04-30 15:12:51 -05:00
CitadelStationBot
9be1a5db4f Moves antag datums to the mind 2017-04-30 14:32:15 -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
CitadelStationBot
e7f9e6652f You can no longer spam-spawn scarabs via Ratvar 2017-04-29 15:44:47 -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
9d50549c22 Ports chem grenades to Initialize 2017-04-29 08:13:56 -05:00
LetterJay
0cf401934b manual merge 2017-04-29 07:57:16 -05:00
kevinz000
9b46470c57 Update artefact.dm 2017-04-29 02:34:43 -07:00
CitadelStationBot
bd4c8dc6c3 Replaces Double Agents with Internal Affairs 2017-04-28 21:08:24 -05:00
CitadelStationBot
b7f125af9b Makes dance machine GBP requirements track-based instead of hardcoded 2017-04-28 21:07:20 -05:00