Commit Graph
4930 Commits
Author SHA1 Message Date
AnturKandCitadelStationBot 317958fb5c Fixes more CanPass misuse (#30493)
* Fixes more CanPass misuse

* Let's not give wrong impression

* spans
2017-09-09 19:41:02 -05:00
CitadelStationBot 1769b0272a Automatic changelog generation for PR #2656 [ci skip] 2017-09-09 01:07:06 -05:00
LetterJayandGitHub 7baf203862 Merge pull request #2656 from Citadel-Station-13/upstream-merge-30457
[MIRROR] Adds Internet admin midi
2017-09-09 01:07:05 -05:00
LetterJayandGitHub 41a3fd8467 Merge pull request #2672 from Citadel-Station-13/upstream-merge-30481
[MIRROR] Placing a robotics factory actually disables shunting
2017-09-09 01:05:54 -05:00
CitadelStationBot b2ffb03cef Automatic changelog generation for PR #2671 [ci skip] 2017-09-09 01:05:31 -05:00
LetterJayandGitHub ba3f92fa17 Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504
[MIRROR] Windoors open when emagged again
2017-09-09 01:05:30 -05:00
LetterJayandGitHub a3e5bfc496 Merge pull request #2669 from Citadel-Station-13/upstream-merge-30489
[MIRROR] Makes computers lose their light when their screens break
2017-09-09 01:05:09 -05:00
CitadelStationBot a47776705a Automatic changelog generation for PR #2666 [ci skip] 2017-09-09 01:04:24 -05:00
LetterJayandGitHub f47e4a8280 Merge pull request #2666 from Citadel-Station-13/upstream-merge-30498
[MIRROR] Golem shells can no longer fit in bags
2017-09-09 01:04:23 -05:00
CitadelStationBot 12a30f8ec1 Automatic changelog generation for PR #2663 [ci skip] 2017-09-09 01:03:18 -05:00
LetterJayandGitHub 5c4940c832 Merge pull request #2663 from Citadel-Station-13/upstream-merge-30389
[MIRROR] Adds a short telegraph to the watcher's blasts
2017-09-09 01:03:15 -05:00
CitadelStationBot 80d0048ac0 Automatic changelog generation for PR #2662 [ci skip] 2017-09-09 01:02:52 -05:00
LetterJayandGitHub 5202705ed7 Merge pull request #2662 from Citadel-Station-13/upstream-merge-30487
[MIRROR] Adds shamebrero penguin for dumb alphonzo
2017-09-09 01:02:50 -05:00
LetterJayandGitHub 4cae24d2c0 Merge pull request #2655 from Citadel-Station-13/upstream-merge-30477
[MIRROR] Updates metadata on title1.ogg
2017-09-09 01:00:15 -05:00
LetterJayandGitHub 780faec591 Merge pull request #2652 from Citadel-Station-13/upstream-merge-30202
[MIRROR] You can now drag things up and down ladders
2017-09-09 00:59:58 -05:00
CitadelStationBot 50d9083bde Placing a robotics factory actually disables shunting 2017-09-08 21:25:28 -05:00
Jordan BrownandCitadelStationBot 5b61c84df4 Merge pull request #30481 from YPOQ/shuntfix
Placing a robotics factory actually disables shunting
2017-09-08 21:25:28 -05:00
CitadelStationBot f3c0a60260 Windoors open when emagged again 2017-09-08 21:22:17 -05:00
Jordan BrownandCitadelStationBot d60a6729d3 Merge pull request #30504 from YPOQ/windooremagfix
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
CitadelStationBot ac1f0985dc Makes computers lose their light when their screens break 2017-09-08 21:01:39 -05:00
orangesandCitadelStationBot 25a5325e24 Merge pull request #30489 from Cyberboss/CompLightFix
Makes computers lose their light when their screens break
2017-09-08 21:01:39 -05:00
CitadelStationBotandPoojawa d35717e1ab [MIRROR] Fixes assault pod blinking docking effects (#2667)
* Fixes assault pod blinking docking effects (#30492)

* Fixes assault pod blinking docking effects
2017-09-08 20:15:10 -05:00
CitadelStationBot a1f79ba143 Golem shells can no longer fit in bags 2017-09-08 13:53:01 -05:00
RobustinandCitadelStationBot 8010c44c72 Golem shells can no longer fit in bags (#30498)
* Automatic changelog generation for PR #30056 [ci skip]

* RIP pocket army

* Delete AutoChangeLog-pr-30056.yml
2017-09-08 13:53:00 -05:00
CitadelStationBot ec1fe518bb Adds a short telegraph to the watcher's blasts 2017-09-08 10:18:41 -05:00
Ashe HiggsandCitadelStationBot 2f438e5f4a Adds a short telegraph to the watcher's blasts (#30389)
* Adds a telegraph to the watcher's blasts

* hmm
2017-09-08 10:18:41 -05:00
CitadelStationBot 3be70082b5 Adds shamebrero penguin for dumb alphonzo 2017-09-08 10:11:21 -05:00
MilitairesandCitadelStationBot 2ab29ccac4 Adds shamebrero penguin for dumb alphonzo (#30487) 2017-09-08 10:11:21 -05:00
CitadelStationBot 60f2a2c5ec Adds Internet admin midi 2017-09-08 09:32:29 -05:00
JJRcopandCitadelStationBot 00dd2f283b Adds Internet admin midi (#30457)
* Adds Internet admin midi

* Moves global regex into proc (shell_url_scrub)

* Moves shelleo to world
Adds quotes around the command in shelleo, to encapsulate it

* Admins can stop playing web sounds

* Revised internet midi extension order
Moved m4a to least preferred,
as it can potentially carry non-aac or non-mpeg-3 audio

* Kills \n in web sound

* play_web_sound availability based on config

* play web sound and shelleo tweaks

istypeless for in play web sound & readability parenthesis around binary AND
add return index defines for shelleo proc

* Security fix for play web sound
2017-09-08 09:32:29 -05:00
CitadelStationBot 157eb57cab Updates metadata on title1.ogg 2017-09-08 07:07:13 -05:00
erwgdandCitadelStationBot 17b5eecf83 Updated metadata on title1.ogg (#30477) 2017-09-08 07:07:13 -05:00
PoojawaandGitHub ce787e7726 Reverts sav file persistance for poly/pun-pun (#2654)
* Reverts sav file persistance for poly/pun-pun

* makes sure poly writes to poly
2017-09-08 06:58:08 -05:00
PoojawaandGitHub ed4488bd1d cleans merge conflict mess of #2638 (#2639) 2017-09-08 06:55:51 -05:00
PoojawaandGitHub 50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -05:00
CitadelStationBot 7155e1c631 Automatic changelog generation for PR #2651 [ci skip] 2017-09-07 16:17:35 -05:00
LetterJayandGitHub a806ecad19 Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486
[MIRROR] Fixes goliath butchering
2017-09-07 15:57:03 -05:00
LetterJayandGitHub d5c4f6e62d Merge pull request #2649 from Citadel-Station-13/upstream-merge-30451
[MIRROR] Disablers and ions wont burn plasma statues statues
2017-09-07 15:55:04 -05:00
LetterJayandGitHub 93a98c000b Merge pull request #2648 from Citadel-Station-13/upstream-merge-30460
[MIRROR] You can't fly with hair on your wings [Bee Suit Hair Suffix Fix]
2017-09-07 15:54:49 -05:00
LetterJayandGitHub 217e077342 Merge pull request #2645 from Citadel-Station-13/upstream-merge-30469
[MIRROR] Fixes containment field CanPass
2017-09-07 15:54:34 -05:00
LetterJayandGitHub 82cfa67581 Merge pull request #2644 from Citadel-Station-13/upstream-merge-30233
[MIRROR] Adds a message when trying to move while buckled
2017-09-07 15:53:38 -05:00
CitadelStationBot a803a512ea You can now drag things up and down ladders 2017-09-07 12:48:43 -05:00
KorPhaeronandCitadelStationBot b9bbd348df You can now drag things up and down ladders (#30202)
* Can drag things up and down ladders

* Somehow left out this line

* Icon update, auto_connect

* Uses the proper pulling proc
2017-09-07 12:48:43 -05:00
CitadelStationBot 99aa3a9217 Fixes goliath butchering 2017-09-07 11:58:42 -05:00
LetterJayandCitadelStationBot ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
CitadelStationBot df50c6b57b Disablers and ions wont burn plasma statues statues 2017-09-07 10:34:45 -05:00
KorPhaeronandCitadelStationBot b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
CitadelStationBot 6521dfa216 You can't fly with hair on your wings [Bee Suit Hair Suffix Fix] 2017-09-07 10:34:36 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot b6eddd8845 ok 2017-09-07 10:34:36 -05:00
CitadelStationBot 2a0996b0af Fixes containment field CanPass 2017-09-07 10:34:11 -05:00