Commit Graph
292 Commits
Author SHA1 Message Date
kevinz000andGitHub 6bf46e1a6d Delete gang.dm.rej 2017-05-07 22:35:48 -07:00
CitadelStationBot 0972689cfc Updated: Reduces dominator timer ceiling, changes territory scaling 2017-05-06 10:44:56 -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
LetterJayandGitHub 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
LetterJayandGitHub f7572e62cf Merge pull request #769 from Citadel-Station-13/upstream-merge-26860
[MIRROR] Removes changeling genetic damage
2017-05-05 09:46:23 -05:00
LetterJayandGitHub c38d507791 Merge pull request #779 from Citadel-Station-13/upstream-merge-26880
[MIRROR] Only one successful Gang Tool recall per gang
2017-05-05 09:44:16 -05:00
LetterJayandGitHub cd1d049c18 Merge pull request #714 from Citadel-Station-13/upstream-merge-26707
[MIRROR] Makes the cult Talisman of Horrors ranged
2017-05-05 09:39:54 -05:00
CitadelStationBot 933a8646ba Only one successful Gang Tool recall per gang 2017-05-05 06:05:05 -05:00
CitadelStationBot 067e0b46ed Removes changeling genetic damage 2017-05-04 19:45:08 -05:00
CitadelStationBot f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
LetterJayandGitHub d5ade71ea9 Merge pull request #706 from Citadel-Station-13/upstream-merge-26745
[MIRROR] Adds persistent trophy cases
2017-05-03 22:49:50 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJayandGitHub 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 aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -05:00
LetterJay 4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJayandGitHub 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
CitadelStationBot ea3ee7accc Adds persistent trophy cases 2017-05-01 17:31:24 -05:00
LetterJayandGitHub 64fd72f1cf Update artefact.dm 2017-05-01 15:31:51 -05:00
LetterJayandGitHub 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 36dfc5a4db Holocalls 2017-05-01 12:53:40 -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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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