Commit Graph

216 Commits

Author SHA1 Message Date
deathride58
1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
Tad Hardesty
a0801a8e92 Scale fullscreen overlays to the view size 2017-11-05 04:52:40 -06:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07:00
Jordan Brown
909f1ba244 Merge pull request #32222 from AnturK/ignoreprovement
Ignore verb now also shows ghost names
2017-10-30 15:06:37 -05:00
LetterJay
e0cbc7b9a2 Fixes character issues on creation 2017-10-30 05:32:06 -05:00
LetterJay
a595bee5af Update preferences.dm 2017-10-29 01:58:33 -05:00
LetterJay
95023664dd Update preferences.dm 2017-10-29 01:53:35 -05:00
LetterJay
f77b66ebb9 Update preferences.dm 2017-10-29 01:40:28 -05:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
LetterJay
12fa1e3ece Update preferences_savefile.dm 2017-10-27 23:54:51 -05:00
deathride58
4fd775ee1d Fixes LOOC error messages not appearing 2017-10-26 16:28:07 -04:00
KorPhaeron
ef9c27ef0a Roundstart species pref fixes/removes redundant species config 2017-10-26 12:00:56 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00
Kyle Spier-Swenson
6c27182bec Fixes client vv not working. (#31556) 2017-10-12 10:39:28 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
LetterJay
661c2d293b Update client_procs.dm 2017-10-07 22:45:04 -05:00
Jordan Brown
91aa560f0d High pop reduced MC processing mode. 2017-10-07 08:42:43 -05:00
LetterJay
abeb003465 Update preferences_savefile.dm 2017-10-05 05:18:04 -05:00
LetterJay
09f6eb6156 Update preferences_savefile.dm 2017-10-04 20:53:42 -05:00
Supermichael777
63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
LetterJay
747312cb6d updates 2017-10-01 00:59:59 -05:00
LetterJay
9da3470521 Update preferences_savefile.dm 2017-09-29 23:44:08 -05:00
LetterJay
03ee5a9303 Update preferences.dm 2017-09-29 23:43:39 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
076ba227e5 Merge pull request #2583 from deathride58/screenshake
Extra Screenshake and Screenshake accessories.
2017-09-24 11:34:50 -04:00
ktccd
c8aeec815a Adds sanitation to flavor_text (#2926)
Exactly what it sounds like. Boy, my security skills are shit, for
someone who's supposed to be studying exactly this shit at uni, isn't
it?
2017-09-24 03:15:02 -05:00
deathride58
4e793a5630 Should work 2017-09-23 13:17:21 -04:00
deathride58
20700dab57 change for the sake of change - laying the groundwork to let players directly change the percentage of screenshake 2017-09-23 11:18:48 -04:00
deathride58
a8ad0e5aa5 Merge branch 'master' into screenshake 2017-09-20 00:08:25 +00:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344
[MIRROR] Traitorbro gamemode
2017-09-18 08:35:00 -04:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842)
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
2017-09-17 22:35:51 -05:00
CitadelStationBot
a94a8f9ab4 [MIRROR] Enables Dead OOC at round-end (#2835)
* Enables Dead OOC at round-end (#30716)

* Enables Dead OOC at roundend

* proc

* proc #2

* Enables Dead OOC at round-end
2017-09-17 22:20:15 -05:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818)
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
2017-09-17 11:56:55 -05:00
Poojawa
7cf4d0797b Applies WRITE_FILE to Citadel saves + Belly clone fix (#2694)
* Applies WRITE_FILE to everything

* Maybe this works, actually

* HAHAH I FIXED IT FUCKOS
2017-09-17 02:26:27 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
c3ef612490 Ports MSO's fading note system 2017-09-11 23:07:30 -05:00
CitadelStationBot
8ee6fdb76a [MIRROR] Fixes stop-sounds not force-stopping internet midis (#2692)
* Fixes stop-sounds not force-stopping internet midis (#30571)

* Update playsound.dm

* Update preferences_toggles.dm (#17)

* Fixes stop-sounds not force-stopping internet midis
2017-09-10 20:29:12 -07: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
LetterJay
2f3f56352c Merge branch 'master' into upstream-merge-30176 2017-09-06 17:43:07 -05:00
LetterJay
82f36f0d28 Delete client_procs.dm.rej 2017-09-06 09:27:57 -05:00
CitadelStationBot
2ab11de906 [MIRROR] Removes a Redundant Check (#2572)
* Removes a Redundant Check

* Removes redundant check
2017-09-04 02:41:41 -05:00
deathride58
bfc9aba710 damage screen shake will no longer show when screen shake is disabled 2017-09-03 20:12:23 -04:00
deathride58
a8328aad8e Overcomplicates things 2017-09-03 18:34:16 -04:00
deathride58
72de6c3968 Nested ternaries? 2017-09-03 17:20:58 -04:00
deathride58
5a618ed548 adds reduced option for screenshake 2017-09-03 13:22:50 -04:00