Commit Graph

94 Commits

Author SHA1 Message Date
LetterJay
cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -06:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
deathride58
7411b25113 trying to fix the bug that causes gear with apostrophes in their name to be unusable 2018-01-17 18:31:42 -05:00
deathride58
b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
deathride58
b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
deathride58
9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05:00
deathride58
036dc82e12 initial commit - initial pref edits and file copypasting from hippie 2018-01-13 15:45:08 -05:00
deathride58
34297d5005 fixes setting flavortext in preferences. hopefully 2018-01-09 23:11:22 -05:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58
39016e36b2 fixing compiling errors one at a time 2018-01-04 02:37:02 -05:00
deathride58
61fdecffe5 ohhHH 2018-01-04 02:30:52 -05:00
deathride58
70e5568d32 web editor is garbage on mobile 2018-01-04 02:26:44 -05:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
oranges
a227ddf3c1 Merge pull request #34025 from DaxDupont/PDAColor
PDA Interface color is now a preference.
2018-01-03 21:12:09 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
deathride58
01c9cf6479 Update preferences.dm 2017-12-10 17:45:21 -05:00
jammer312
c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
1d4ae5196c it works 👍 2017-11-13 17:00:26 -05:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07: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
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
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
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
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
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
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
ktccd
4fdd3215d6 Fixes no-genitalia
Genitals now updates with any changes.
All the other changes in the code you see in the commit, I didn't touch.
Nothing changed, git just thinks I replaced some lines with themselves
for some godawful reason.....
2017-08-06 11:12:13 +02:00
CitadelStationBot
d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00