Commit Graph

1063 Commits

Author SHA1 Message Date
LetterJay
86ea3efeef Merge pull request #659 from Citadel-Station-13/upstream-merge-26687
[MIRROR] Moves config/names to strings/names
2017-05-01 08:01:41 -05:00
CitadelStationBot
69df03ff9e Automatic changelog generation for PR #656 [ci skip] 2017-05-01 08:00:42 -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
c93c5bf50f Merge pull request #655 from Citadel-Station-13/upstream-merge-26693
[MIRROR] Prevents GODMODE mobs from dying to organ removal
2017-05-01 08:00:07 -05:00
LetterJay
061e49d651 Merge pull request #654 from Citadel-Station-13/upstream-merge-26662
[MIRROR] Status effects are actually deleted/handled when the mob is deleted
2017-05-01 07:59:55 -05:00
LetterJay
d46b85e9ed Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -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
6c8467d473 Merge pull request #650 from Citadel-Station-13/upstream-merge-26648
[MIRROR] Removes some unused tools
2017-05-01 07:59:05 -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
b2c1ff2bc2 Merge pull request #647 from Citadel-Station-13/upstream-merge-26398
[MIRROR] Old ore processor cleanup
2017-05-01 07:57:38 -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
CitadelStationBot
1bdd4e43c2 Automatic changelog generation for PR #644 [ci skip] 2017-05-01 07:56:18 -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
1a5ab1d5be Merge pull request #639 from Citadel-Station-13/upstream-merge-26633
[MIRROR] Adds death checks to two hallucinations, preventing the dead from spasming
2017-05-01 07:44:25 -05:00
CitadelStationBot
c3c8688cbd Automatic changelog generation for PR #638 [ci skip] 2017-05-01 07:44:16 -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
bd2b4207e2 Merge pull request #637 from Citadel-Station-13/upstream-merge-26204
[MIRROR] Option for admins to show a song's title
2017-05-01 07:43:59 -05:00
CitadelStationBot
f553fbe4b3 Automatic changelog generation for PR #635 [ci skip] 2017-05-01 07:43:28 -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
CitadelStationBot
feef059cef Automatic changelog generation for PR #633 [ci skip] 2017-05-01 07:43:02 -05:00
LetterJay
8adddd5916 Merge pull request #633 from Citadel-Station-13/upstream-merge-26626
[MIRROR] Syndie Lavaland Base Flavortext Edit
2017-05-01 07:43:01 -05:00
CitadelStationBot
9b505d004b Automatic changelog generation for PR #632 [ci skip] 2017-05-01 07:42:52 -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
CitadelStationBot
98c3823327 Automatic changelog generation for PR #631 [ci skip] 2017-05-01 07:42:38 -05:00
LetterJay
25f1a398fe Merge pull request #631 from Citadel-Station-13/upstream-merge-26622
[MIRROR] Adds organ storage containers
2017-05-01 07:42:37 -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
CitadelStationBot
7ec11b3ca1 Automatic changelog generation for PR #629 [ci skip] 2017-05-01 07:41:54 -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
a0f090b926 Automatic changelog generation for PR #625 [ci skip] 2017-05-01 07:41:18 -05:00
LetterJay
d5a4be2581 Merge pull request #625 from Citadel-Station-13/upstream-merge-26616
[MIRROR] Librarians can speak any language
2017-05-01 07:41:16 -05:00
LetterJay
780216d7f9 Merge pull request #623 from Citadel-Station-13/upstream-merge-26627
[MIRROR] >unironically spelling unironically wrong
2017-05-01 07:40:55 -05:00
CitadelStationBot
542d1632bc Automatic changelog generation for PR #622 [ci skip] 2017-05-01 07:40:44 -05:00
LetterJay
0292483e4b Merge pull request #622 from Citadel-Station-13/upstream-merge-26639
[MIRROR] Language icons
2017-05-01 07:40:43 -05:00
LetterJay
f50955dfd8 Merge pull request #612 from Citadel-Station-13/upstream-merge-26609
[MIRROR] Makes minibot listen on a configurable port
2017-05-01 07:39:46 -05:00
CitadelStationBot
cd8e9399ae Automatic changelog generation for PR #609 [ci skip] 2017-05-01 07:39:36 -05:00
LetterJay
2d9a497f31 Merge pull request #609 from Citadel-Station-13/upstream-merge-26625
[MIRROR] Server hop can now be used in lobby
2017-05-01 07:39:35 -05:00
TalkingCactus
fc9e2a46d6 fixes #618 (#675) 2017-05-01 05:29:35 -04:00
CitadelStationBot
d696954cd5 Moves config/names to strings/names 2017-04-29 19:49:29 -05:00
CitadelStationBot
e775ce3f35 Bank Machine now uses the radio rather than announcements 2017-04-29 16:58:04 -05:00
CitadelStationBot
c0e0e6c538 Prevents GODMODE mobs from dying to organ removal 2017-04-29 16:55:58 -05:00
CitadelStationBot
fccbe18286 Status effects are actually deleted/handled when the mob is deleted 2017-04-29 16:50:50 -05:00
CitadelStationBot
c6544f20fd Fix SDQL vars again 2017-04-29 16:36:36 -05:00
CitadelStationBot
e7f9e6652f You can no longer spam-spawn scarabs via Ratvar 2017-04-29 15:44:47 -05:00
CitadelStationBot
a928f5dbaa Removes some unused tools 2017-04-29 15:44:43 -05:00
LetterJay
fca3f200b3 fixed RD PDA sprite 2017-04-29 08:27:54 -05:00
CitadelStationBot
9d50549c22 Ports chem grenades to Initialize 2017-04-29 08:13:56 -05:00
kevinz000
9b46470c57 Update artefact.dm 2017-04-29 02:34:43 -07:00
CitadelStationBot
4da7414339 Old ore processor cleanup 2017-04-29 03:46:03 -05:00