Commit Graph

196 Commits

Author SHA1 Message Date
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
deathride58
feeb76e472 Nerfs KA screenshake, moves cit_screenshake.dm to modular_citadel/, and adds a screenshake pref. 2017-09-03 05:24:14 -04:00
LetterJay
3e0ead1204 Merge branch 'master' into upstream-merge-29105 2017-09-02 07:11:32 -05:00
LetterJay
74307f2858 Update preferences.dm 2017-09-02 06:55:52 -05:00
kevinz000
0925cb108b wew 2017-08-29 22:09:42 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
CitadelStationBot
2a0f617f68 Adds more round id tracking 2017-08-28 05:50:05 -05:00
ktccd
cdfa4148b4 Makes genitals_use_skintone save (#2514)
Adds a hook or whatever for it to save the setting.
Now, granted, with my previous PR this is probably pointless since
humans got custom colours now...
But it's good practice, you know? In case we revert the other PR and
all.
2017-08-27 04:22:04 -07:00
ktccd
597c048975 This was bothering me (#2449)
Now it's fixed.
2017-08-21 17:03:41 -07:00
CitadelStationBot
196c9d0597 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. 2017-08-20 06:01:24 -05:00
LetterJay
79c44b053d Merge branch 'master' into upstream-merge-29794 2017-08-18 11:14:45 -05:00
LetterJay
0ffaf66d1f Merge branch 'master' into upstream-merge-29690 2017-08-15 19:18:22 -05:00
LetterJay
d133510288 Update preferences_savefile.dm 2017-08-15 19:06:41 -05:00
LetterJay
ab27b63cf9 Merge branch 'master' into upstream-merge-29611 2017-08-15 18:55:12 -05:00
CitadelStationBot
bd35823012 [ready]Makes bIcon better 2017-08-13 17:41:12 -05:00
LetterJay
fdfb61b527 Update client_procs.dm 2017-08-13 09:50:51 -05:00
CitadelStationBot
501972a2f8 Removes chat pings from href logs 2017-08-13 01:26:46 -05:00
ktccd
4188db53a5 Flavortext transition finished
Now properly moves OLD flavortext to the new format and then removes the
old format.
If no old format is found, it defaults to loading the new format.
Flavortext is now stored in your DNA, and is loaded into your characters
flavor_text variable upon creating the character or messing with the
DNA.
This allows cloners/pods/changelings to use the correct flavortext.
2017-08-11 23:48:46 +02:00
ktccd
1b2f2120ec DO NOT MERGE - Fixes random resetting of file
I did a bad with the direction of >> and <<. My bad.
Fixed now, I will test FURTHER to confirm that old files are not deleted
or ruined.
2017-08-11 23:10:05 +02:00
ktccd
d7ac827ea6 Testing Transition code, DO NOT MERGE YET!!
As it says, do not merge until I confirm that it works.
2017-08-11 21:59:35 +02:00
ktccd
62a7d4301f Refactored flavortext.
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
2017-08-11 20:13:01 +02:00