Commit Graph

1242 Commits

Author SHA1 Message Date
dearmochi
c6d5f294c8 Clean up skin.dmf, fix input darkmode, add statusbar toggle option (#17281)
* Clean up skin.dmf, fix input darkmode, add statusbar toggle option

* no screentips for MC/screen objs
2022-01-02 19:57:02 +00:00
S34N
3050a36b11 Ensures saved screentip prefs load properly (#17282) 2021-12-30 12:41:39 +01:00
S34N
8359b71824 Ports TG statusbar changes & screentips (#16505) 2021-12-29 15:16:50 +01:00
Fox McCloud
9317e352eb Merge pull request #17223 from AffectedArc07/idiot-proofing-2021-12-13
Adds a privacy warning for ban appeal screenshots
2021-12-13 15:09:49 -05:00
AffectedArc07
c82743a101 Adds a privacy warning for ban appeal screenshots 2021-12-13 11:50:47 +00:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
AffectedArc07
01044ab481 Ban refactor part 1/3 - Removes appearance bans (#17125) 2021-11-18 14:24:50 +01:00
Fox McCloud
55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
AffectedArc07
ab92435be0 Karma refactor (#17070)
* Karma refactor

* This too

* Fixes recursion

* Fixes bugs

* Fixes bad usr

* Update code/modules/karma/karma_holder.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Logic tweak

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-11-15 13:52:56 +01:00
Fox McCloud
5e41a1e1d1 Ensure Alt Title Sanity (#17104) 2021-11-15 12:38:09 +01:00
Fox McCloud
8061afa550 Merge pull request #16172 from dearmochi/hair-gradients
[READY] Port hair gradient customization
2021-11-11 15:40:21 -05:00
SweetBlueSylveon
2fdcbf8551 Grey Plushie Get! (#16991)
* Adds a Grey Plushie

Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

* Adds water interaction

Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

* Minor fixes

Fixes minor syntax and redundancy problem in the code.

* Updated sprite

Adds new sprites for grey_plushie and grey_singed.

* Converts Cooldown and spawn system to timer.

Changes the cooldown and spawn system to a timer and callback system.

* Update code/game/objects/items/toys.dm

Adds early return.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/game/objects/items/toys.dm

Simplifies code, corrects mistakes.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Complicated

-Splits the cooldown variable and proc into two, one for hugging one for screaming.
-Adds more BOOLEAN
-Properly implements Timer and Callback system.
-Adds early returns.

* Revert "Complicated"

reverts dme changes.

* Adds an if statement

Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

* Minor correction

Fixes the order of the if statement and changes its type.

* Reverts test change

Last commit had testing changes I failed to revert before pushing.

* Changes the sprite.

-New, smaller icons.
-Slightly heavier shading.
(Can be undone and edited further, I still have the other sprites)

* Another sprite update

-I learned to use HSL.

* Small bugfix

Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-06 17:34:17 +01:00
AffectedArc07
db3a3c8bc2 Adds Paradise API support (#16981) 2021-11-05 14:04:49 +01:00
mochi
c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02:00
AffectedArc07
e843d297bf Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 20:49:07 +01:00
variableundefined
9470fd0387 Merge pull request #16889 from AffectedArc07/cui-cdl
Moves CUI entries to CDL
2021-10-17 13:57:14 -05:00
variableundefined
e65ce685ca Merge pull request #16902 from AffectedArc07/magistrate-hour-lock
Moves magistrate to a 100 security hour lock instead of karma
2021-10-17 13:22:23 -05:00
AffectedArc07
712dcb8904 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-17 15:14:03 +01:00
SabreML
1db94b18f1 White runechat toggle fix (#16949) 2021-10-15 14:10:04 +01:00
AffectedArc07
4ad5e41324 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-12 20:27:07 +01:00
SabreML
bc739c353d Loadout DB Storage Refactor (#16453)
* `display_name` -> Typepaths V1

* Loadout display name capitalisation

#15857

* Review 1, plus json fixes

* (Hopefully) final tweaks

* Styling nitpicks

* Extra tweaks because why not

It never caused a runtime, but the `?.` is just in case.

* Deconflicting

* Warning comment

* Whoops

Typing faster than my brain
2021-10-09 19:35:15 +01:00
AffectedArc07
b4bfb521d5 Moves magistrate to a 100 hour lock 2021-10-09 18:36:31 +01:00
AffectedArc07
3df98437c6 Moves CUI entries to CDL 2021-10-07 13:20:44 +01:00
AffectedArc07
c358a20498 Moves pAI saves to the DB 2021-10-04 19:15:53 +01:00
variableundefined
d25cafedb8 Merge pull request #16862 from FlattestGuitar/stealthmin-fixes
stealthmin fix
2021-10-03 20:46:03 -05:00
Mieszko Je
134a4bb663 stealthmin fix 2021-10-03 18:17:53 +02:00
AffectedArc07
7a0134e6e2 Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support 2021-10-02 19:49:28 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
variableundefined
35dc28a1f8 Merge pull request #16759 from AffectedArc07/webmap-button
Adds a webmap button
2021-09-22 22:35:08 -05:00
AffectedArc07
16705136ea Enforces 2FA for admin accounts 2021-09-22 15:12:45 +01:00
AffectedArc07
7d939571a3 Adds a webmap button 2021-09-21 16:02:06 +01:00
AffectedArc07
890e7e5ce5 I think this is instance communication 2021-09-20 23:50:51 +01:00
AffectedArc07
2c5276dbb9 Fox tweaks 2021-09-20 19:14:04 +01:00
AffectedArc07
fa6787f8d4 Removes preference datum caching 2021-09-08 14:25:31 +01:00
AffectedArc07
afd01ecfe1 Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-08 14:15:17 +01:00
Fox McCloud
be49c778cf Merge pull request #16647 from AffectedArc07/514-patch
The 514 patch
2021-09-08 09:14:26 -04:00
AffectedArc07
99e58c6c0f Apply suggestions from code review 2021-09-07 20:49:33 +01:00
AffectedArc07
8b23fc8726 And this 2021-09-07 17:52:18 +01:00
AffectedArc07
fce2828724 Moves mutes to a GLOB 2021-09-07 15:09:37 +01:00
AffectedArc07
e73866cbf5 Review tweaks 2021-09-07 12:52:28 +01:00
AffectedArc07
04e3481bf3 The 514 patch 2021-09-07 11:43:42 +01:00
variableundefined
5a9b70b7fb Merge pull request #16447 from S34NW/outline_port
Ports item hover outline
2021-09-06 21:42:50 -05:00
AffectedArc07
633a8bcfa5 Removes bay-era warning system 2021-09-03 13:16:49 +01:00
AffectedArc07
70fd70f2eb Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-02 14:01:27 +01:00
AffectedArc07
4062bc6b1a Merge branch 'master' into client-data-loading 2021-08-29 20:56:41 +01:00
AffectedArc07
2c613b3a56 Admin message 2021-08-14 14:36:34 +01:00
AffectedArc07
42ebe326a6 Replaces panic bunker with queue server 2021-08-13 22:24:25 +01:00
AffectedArc07
1f9994d1d7 Hotfix - New characters dont save 2021-08-13 14:06:50 +01:00
AffectedArc07
fde941b057 Fixes this 2021-08-12 13:25:13 +01:00
matttheficus
ee1a75b5b6 Variety of Admin Alert Readability Tweaks (#16496)
* Color Swap

* more bad blue
2021-08-12 13:09:54 +01:00