Commit Graph
6600 Commits
Author SHA1 Message Date
JamieHandCitadelStationBot 2f41af546e Allows easy hosting of server side lobby music (#31352)
* Allows easy hosting of server side lobby music

* No images here!!!

* Undelete /tg/ sounds... REEE

* Add back the old system and use it if this doesn't find any music

* Documentation++

* Update round_start_sounds.txt

* Allow for rare map specific title music

Also don't attempt to play non-valid sounds/non-sounds

* Fix bad sound filter, fix common sounds

* Update README.txt

* Update ticker.dm

* Update ticker.dm
2017-10-08 13:17:01 -05:00
CitadelStationBot c91d54c6a6 Automatic changelog generation for PR #3213 [ci skip] 2017-10-08 12:05:42 -05:00
deathride58andkevinz000 5d0853e16a Crew objective/miscreant system tweaks (#3213)
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
2017-10-08 10:05:40 -07:00
CitadelStationBot c222fa42f9 Automatic changelog generation for PR #3211 [ci skip] 2017-10-08 01:04:39 -05:00
CitadelStationBotandkevinz000 57d58163d2 [MIRROR] Overloaded leg actuators now consume at least 100 power per step (#3211)
* Merge pull request #31389 from Y0SH1M4S73R/patch-1

Overloaded leg actuators now consume at least 100 power per step

* Overloaded leg actuators now consume at least 100 power per step
2017-10-07 23:04:36 -07:00
CitadelStationBotandkevinz000 d1dcfb63f8 [MIRROR] Miscellaneous virus fixes (#3216)
* Miscellaneous virus fixes (#31391)

* Probably fixes neutering bugs

* Proper targeting for healing

* Fixes itching affecting roboparts

* Miscellaneous virus fixes
2017-10-07 23:04:26 -07:00
CitadelStationBotandkevinz000 f579a3bf74 [MIRROR] Fix adding bad config entries (#3219)
* Fixes adding bad config entries (#31390)

* Fix adding bad config entries
2017-10-07 23:04:14 -07:00
CitadelStationBot dee8efc7e8 Automatic changelog generation for PR #3214 [ci skip] 2017-10-08 00:52:45 -05:00
deathride58andkevinz000 280b5f5e6f Adds kinkmates to Metastation and Deltastation (+Box tweaks) (#3214)
* adds kinkmates to deltastation

* added kinkmates to metastation

* hides atmos pipes in maint dorms
2017-10-07 22:52:43 -07:00
LetterJay 2acc990425 donation items / framework for some 2017-10-07 23:27:25 -05:00
LetterJayandGitHub 398455917d Merge pull request #3204 from Citadel-Station-13/upstream-merge-31372
[MIRROR] Fixes cool threads grammar issue
2017-10-07 23:44:25 -04:00
CitadelStationBot 47866c823c Automatic changelog generation for PR #3203 [ci skip] 2017-10-07 22:44:07 -05:00
LetterJayandGitHub 04846a2f66 Merge pull request #3203 from Citadel-Station-13/upstream-merge-31376
[MIRROR] Nightmare spawn event
2017-10-07 23:44:06 -04:00
LetterJayandGitHub f95ba7dfaa Merge pull request #3202 from Citadel-Station-13/upstream-merge-31378
[MIRROR] Lets cyborgs use ladders
2017-10-07 23:43:50 -04:00
LetterJayandGitHub 662a7d55cd Merge pull request #3201 from Citadel-Station-13/upstream-merge-31383
[MIRROR] Fixes grammar on zippos
2017-10-07 23:43:35 -04:00
LetterJayandGitHub 410c0e6d12 Merge pull request #3200 from Citadel-Station-13/upstream-merge-31380
[MIRROR] Adds a rdconsole to omegastation robotics
2017-10-07 23:43:15 -04:00
LetterJayandGitHub 4cc8703a93 Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375
[MIRROR] Fixes clockcult runtime
2017-10-07 23:42:57 -04:00
LetterJayandGitHub 21f5d993d8 Merge pull request #3197 from Citadel-Station-13/upstream-merge-31337
[MIRROR] Nerfs shotgun darts
2017-10-07 23:42:36 -04:00
LetterJayandGitHub 8fdf275b26 Merge pull request #3193 from Citadel-Station-13/upstream-merge-31309
[MIRROR] Config option to automatically call the shuttle for high casualties
2017-10-07 23:42:17 -04:00
CitadelStationBot d600df9ba2 Automatic changelog generation for PR #3143 [ci skip] 2017-10-07 16:01:44 -05:00
Neriandkevinz000 4bc4ab7fc5 Oh. That's what was missing. (#3143)
Boop.
2017-10-07 14:01:43 -07:00
CitadelStationBot cec2ba9c62 Fixes cool threads grammar issue 2017-10-07 08:42:36 -05:00
Jordan BrownandCitadelStationBot 20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings
Fixes cool threads grammar issue
2017-10-07 08:42:36 -05:00
CitadelStationBot 21beac428d Nightmare spawn event 2017-10-07 08:41:25 -05:00
KorPhaeronandCitadelStationBot 39728cc9b3 Nightmare spawn event (#31376)
* Nightmare Event

* Update nightmare.dm

* Standards
2017-10-07 08:41:25 -05:00
CitadelStationBot d26147aa60 Lets cyborgs use ladders 2017-10-07 08:40:15 -05:00
kevinz000andCitadelStationBot 13aa6f8650 Lets cyborgs use ladders (#31378) 2017-10-07 08:40:15 -05:00
CitadelStationBot 2f2f9185f9 Fixes grammar on zippos 2017-10-07 08:38:05 -05:00
Jordan BrownandCitadelStationBot a8c4a155a5 Merge pull request #31383 from BeeSting12/youlights
Fixes grammar on zippos
2017-10-07 08:38:04 -05:00
CitadelStationBot d59066096d Adds a rdconsole to omegastation robotics 2017-10-07 08:36:53 -05:00
kevinz000andCitadelStationBot 614caa782a Adds a rdconsole to omegastation robotics (#31380) 2017-10-07 08:36:52 -05:00
CitadelStationBot 432f0d36c8 Fixes clockcult runtime 2017-10-07 07:46:52 -05:00
AnturKandCitadelStationBot 84490f919e Fixes clockcult runtime 2017-10-07 07:46:52 -05:00
CitadelStationBot ad19f2746c Nerfs shotgun darts 2017-10-07 00:18:04 -05:00
jughuandCitadelStationBot 466a6806e1 Allows shotgun darts to cause reagent reactions (#31337) 2017-10-07 00:18:04 -05:00
CitadelStationBot 5f4b3594d0 Automatic changelog generation for PR #3195 [ci skip] 2017-10-07 00:08:20 -05:00
LetterJayandGitHub 0c6be827a2 Merge pull request #3195 from Citadel-Station-13/upstream-merge-31364
[MIRROR] Fixes Wood Being Invisible.
2017-10-07 01:08:18 -04:00
LetterJayandGitHub 233388a345 Merge pull request #3194 from Citadel-Station-13/upstream-merge-31347
[MIRROR] Makes put_in_hands use drop_location()
2017-10-07 01:08:10 -04:00
LetterJayandGitHub 5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -04:00
LetterJayandGitHub ad43fdd5e8 Merge pull request #3192 from Citadel-Station-13/upstream-merge-31307
[MIRROR] Fixes maintainer detection for review auto-tagging
2017-10-07 01:07:12 -04:00
LetterJayandGitHub 03bd841ac3 Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344
[MIRROR] Lightgeists are gold core spawnable
2017-10-07 01:07:03 -04:00
LetterJayandGitHub 091d7a743a Merge pull request #3190 from Citadel-Station-13/upstream-merge-31353
[MIRROR] Autotagging tgui tree to UI label
2017-10-07 01:06:55 -04:00
LetterJayandGitHub 7e547fa2cd Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359
[MIRROR] Adds Wumborian Fugu to the gold core spawn
2017-10-07 01:06:46 -04:00
LetterJayandGitHub bc91ec435f Merge pull request #3188 from Citadel-Station-13/upstream-merge-31357
[MIRROR] Resolving tickets now informs the player.
2017-10-07 01:06:16 -04:00
LetterJayandGitHub b2095ce61d Merge pull request #3187 from Citadel-Station-13/upstream-merge-31397
[MIRROR] actually fixes the exploit this time
2017-10-07 01:06:04 -04:00
LetterJayandGitHub 5988122386 Merge branch 'master' into upstream-merge-31397 2017-10-07 01:05:58 -04:00
LetterJayandGitHub dc6d97a69a Merge pull request #3186 from Citadel-Station-13/upstream-merge-31362
[MIRROR] Fixes deconstructive analyzer infinite material exploit
2017-10-07 01:05:33 -04:00
LetterJayandGitHub fe27aa586c Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336
[MIRROR] Fixes lighting object initialization on new zlevels.
2017-10-07 01:05:11 -04:00
CitadelStationBot acd3950652 Automatic changelog generation for PR #3185 [ci skip] 2017-10-07 00:05:04 -05:00
LetterJayandGitHub 388ee9c5b7 Merge pull request #3185 from Citadel-Station-13/upstream-merge-31322
[MIRROR] Changes lower action icons to be text based
2017-10-07 01:05:03 -04:00