Commit Graph

5103 Commits

Author SHA1 Message Date
Jordan Brown 92b78d3298 [s] Adds a security token to all admin hrefs 2017-09-08 21:16:02 -05:00
oranges 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
CitadelStationBot 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
deathride58 c1078c2c3e eugh 2017-09-08 17:56:42 -04:00
deathride58 bed1f4d88e gonna compile sooner or later 2017-09-08 17:27:57 -04:00
deathride58 591a086a4f .... apparently poly isn't a pet? 2017-09-08 17:17:59 -04:00
deathride58 3852a246f8 byond cant handle ternaries 2017-09-08 16:47:42 -04:00
deathride58 c852910714 there we go 2017-09-08 16:34:20 -04:00
deathride58 547799c3ac bluh 2017-09-08 16:26:33 -04:00
deathride58 9116be1e53 Extra objectives for assistants, poly objective for CE 2017-09-08 16:20:40 -04:00
Robustin 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
Ashe Higgs 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
Militaires 2ab29ccac4 Adds shamebrero penguin for dumb alphonzo (#30487) 2017-09-08 10:11:21 -05:00
ExcessiveUseOfCobblestone 33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
Armhulen 0dfe72d77e chainsaws rebalance, but working this time :) 2017-09-08 10:00:47 -05:00
kingofkosmos cf07ead653 Regularizes resisting out of containers 2017-09-08 09:58:34 -05:00
JJRcop 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
Poojawa 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
Poojawa 62225acc2b Update verbs.dm 2017-09-08 06:56:31 -05:00
Poojawa 50cd75df7d Actually makes Citadel reagents process (#2653) 2017-09-08 06:55:19 -05:00
LetterJay a806ecad19 Merge pull request #2651 from Citadel-Station-13/upstream-merge-30486
[MIRROR] Fixes goliath butchering
2017-09-07 15:57:03 -05:00
LetterJay 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
LetterJay 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
LetterJay 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
LetterJay 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
deathride58 f8d149975f engineering objectives, removes assistant petsplosion 2017-09-07 15:43:17 -04:00
KorPhaeron 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
LetterJay ff219f365e Update goliath.dm (#30486) 2017-09-07 11:58:42 -05:00
KorPhaeron b172025e96 Disablers and ions wont burn statues 2017-09-07 10:34:44 -05:00
ExcessiveUseOfCobblestone b6eddd8845 ok 2017-09-07 10:34:36 -05:00
AnturK c2c69d359f Fixes shuttle name on ramming. 2017-09-07 10:34:28 -05:00
kingofkosmos f4dbb6dc36 Fixes drone light toggle while dead 2017-09-07 10:34:20 -05:00
AnturK df3b4c10bc Fixes containment field CanPass 2017-09-07 10:34:11 -05:00
LetterJay c55ac69e4a Merge pull request #2634 from Citadel-Station-13/upstream-merge-30458
[MIRROR] Allows atmos techs to download the SM monitor
2017-09-07 10:23:15 -05:00
LetterJay 21a72cd04c Merge pull request #2640 from Citadel-Station-13/upstream-merge-30436
[MIRROR] More timer debugging for the debug gods.
2017-09-07 10:22:45 -05:00
LetterJay 9ca0d6588d Merge pull request #2642 from Citadel-Station-13/upstream-merge-30400
[MIRROR] Adds a unique suicide to the hierophant club, plus some attack verbs
2017-09-07 10:22:17 -05:00
LetterJay 8d854a53d8 Merge pull request #2637 from Citadel-Station-13/upstream-merge-30426
[MIRROR] Fixes swarmers breaking the SM's containment
2017-09-07 10:21:57 -05:00
kingofkosmos dd27a1850a Adds a message when trying to move while buckled 2017-09-07 10:12:32 -05:00
Ashe Higgs 938c10ad1c Adds a unique suicide to the hierophant club, plus some attack verbs (#30400)
* Adds a suicide to the hierophant club

* Above

* good point

* Removes the delay
2017-09-07 10:01:55 -05:00
Kyle Spier-Swenson 3f025582f2 Gives admins the ability to show a read only vv window to a player 2017-09-07 10:01:47 -05:00
LetterJay 31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
Kyle Spier-Swenson 4b02f01a66 More timer debugging for the debug gods. (#30436)
* More timer debugging for the debug gods.

* Its times like this I wish I could amend commit from the web interface

* git commit -a -amend&&git push --force
2017-09-07 09:59:28 -05:00
LetterJay 8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay eee21d496d oops 2017-09-07 07:23:52 -05:00
LetterJay 2ec925f66b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-07 07:21:56 -05:00
LetterJay b5d80219ac donation item 2017-09-07 07:21:42 -05:00
LetterJay 1162edad65 Merge pull request #2632 from Citadel-Station-13/upstream-merge-30452
[MIRROR] Alters the pressure plate crafting recipe
2017-09-07 06:26:51 -05:00
ShizCalev 7fb4426011 Fixes swarmers breaking the SM's containment (#30426)
* Fixes swamers breaking the SM

* Switched checks to use get_area
2017-09-07 05:17:51 -05:00
ShizCalev d8a3b87719 Fixes brains counting towards highlander killstreaks 2017-09-07 05:14:39 -05:00
deathride58 d5151ed918 fixes 2017-09-07 01:01:23 -04:00