Commit Graph

476 Commits

Author SHA1 Message Date
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
mochi c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02:00
SabreML 1db94b18f1 White runechat toggle fix (#16949) 2021-10-15 14:10:04 +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 129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +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
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
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 8ee04f3b40 Null character hotfix 2021-08-05 23:01:04 +01:00
AffectedArc07 d0293b4a16 oops 2021-08-05 12:37:34 +01:00
SabreML baf15f25a7 Fixes runtimes caused by null client preferences (#16464)
* Client check

* Skip character randomisation
2021-08-01 12:31:43 +01:00
AffectedArc07 f73af8b3cf Refactors client data loading 2021-07-29 12:52:45 +01:00
S34NW 43f5c2fa18 would help if i got these the right way around eh? 2021-07-28 17:45:26 +01:00
S34NW 14bfd19814 Like tracing your hand but for items 2021-07-28 17:04:48 +01:00
dearmochi dbab95dd96 Merge branch 'master' into hair-gradients 2021-07-27 18:35:55 +02:00
dearmochi 502258e348 Merge branch 'master' into hair-gradients 2021-07-27 18:28:46 +02:00
variableundefined 5661f74e34 Merge pull request #16433 from AffectedArc07/sql-schema-update
Removes table prefixes
2021-07-27 08:33:56 -04:00
Fox McCloud 5ae91985c6 Merge pull request #16046 from Onyxarias/Veiltime
Tajaran Sleek Veil Flashproofing
2021-07-26 15:33:45 -04:00
AffectedArc07 bede78aeff Removes table prefixes 2021-07-26 17:21:24 +01:00
variableundefined 53f489d766 Merge pull request #16132 from Leanfrog/Sec-Bomber-Jacket-Armor-+-Loadout
Standardizes Sec Bomber Jacket Armor And Adds To Loadout
2021-07-25 09:15:08 -04:00
AffectedArc07 9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
SabreML 908c4f0dd1 Jobban adjustments (#16319)
* Borer ban

* Terror Spider jobban category

* Defines
2021-07-09 11:39:01 +01:00
SabreML 5ed4c3ca83 Loadout Instruments (#15633) 2021-07-08 22:57:54 +01:00
melandor0 612bb0a3bb remove mouse ears (#16214)
Mouse ears were originally the vanity/flair item made for me that somehow made their way into the autodrobe, then out of the autodrobe and into donator items. I'd like to reclaim my vanity item, and thus remove it from donor availability.
2021-06-29 11:40:52 +01:00
AffectedArc07 ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
S34N 00de6dc6c1 Adds pref to remove internals pressure from status tab, adds it to inspect text (#16110)
* yeets the internals from status panel

* adds pressure reading to the tank inspect text

* Adds a pref toggle

* numbers are hard

* catchup with master

* Revert "catchup with master"

This reverts commit bb972cb110.
2021-06-17 10:30:30 +01:00
mochi ca78e5f311 Add hair gradient customization 2021-06-13 10:55:21 +02:00
Leanfrog a3eee4b6cb Armor + Loadout 2021-06-06 13:01:47 -04:00
AffectedArc07 f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
AffectedArc07 8e6787a791 2FA for server login (#16094)
* AA2FA

* Its always dbconfig

* Extra security

* oops
2021-05-30 12:19:56 -04:00
AffectedArc07 968d1bc88d Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-24 15:30:20 +01:00
AffectedArc07 51f673c7b5 Another preferences bandaid 2021-05-23 23:08:17 +01:00
AffectedArc07 3bb24faec2 Sabre tweaks 2021-05-23 23:04:45 +01:00
AffectedArc07 c789810b82 moves this 2021-05-23 17:32:57 +01:00
AffectedArc07 7486d026b7 READY 2021-05-23 17:26:17 +01:00
Onyxarias 10fd2da8c8 Removed taj racial restrictions. 2021-05-19 09:11:53 -07:00
SabreML 02164ad0f0 Operator typos (#16048) 2021-05-18 20:55:41 +01:00
Onyxarias 7ee3b8548c Flashproofs sleek, adds species restrictions to others. 2021-05-17 15:20:58 -07:00
AffectedArc07 8dd5dfbf7f URL configuration 2021-05-16 21:14:10 +01:00
AffectedArc07 c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00