Commit Graph

121 Commits

Author SHA1 Message Date
Vi3trice
8753e22a8e Rework toy card decks into standard decks (#17925)
* Go fish

* Keep forgetting about the map

* Forgot about the sprites for the double deck

* Cleaned things up

* Fix icon conflict

* Update cards.dm

* Improper tweaks

* Update cards.dm

* Axing the popup from the toy version entirely, that was a little jank

* Meta remap was merged

* Huh. \improper was the issue.

* Update cards.dm

* Few changes and a fix

* More changes

* Update cards.dm

* Update cards.dm

* Update cards.dm

* Merge branch 'master' into go-fish

* Update cards.dm
2022-06-27 22:38:15 +01:00
BrickTheHooman
4239b71037 Adds a nian plushie (#17914)
* add nian plush

* comply with pr review suggestions

* changes pt 2
2022-06-07 11:37:05 +01:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01: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
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
Fox McCloud
5ae91985c6 Merge pull request #16046 from Onyxarias/Veiltime
Tajaran Sleek Veil Flashproofing
2021-07-26 15:33:45 -04: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
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
Leanfrog
a3eee4b6cb Armor + Loadout 2021-06-06 13:01:47 -04:00
Onyxarias
10fd2da8c8 Removed taj racial restrictions. 2021-05-19 09:11:53 -07:00
Onyxarias
7ee3b8548c Flashproofs sleek, adds species restrictions to others. 2021-05-17 15:20:58 -07:00
SabreML
9a95d16502 Fixes loadout errors appearing on every round (#15861)
* Single letter PR

* Runtimes
2021-04-09 16:10:24 +01:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Mitchs98
7696ca8b69 adds synth to loadout (#14988) 2020-12-16 14:07:14 -05:00
AffectedArc07
435ddb992e Merge pull request #14872 from SabreML/Detective-badges
Allows Detectives to get a holobadge from the loadout
2020-11-15 09:26:16 +00:00
AffectedArc07
fb7c30434a Merge pull request #14873 from Stokes52/motorcycle_jacket
Add new leather motorcycle jacket
2020-11-13 21:52:33 +00:00
meow20
788eac4392 Update loadout_general.dm 2020-11-11 22:23:20 +01:00
SabreML
72432af131 Holobadges for the Detective 2020-11-11 19:13:54 +00:00
Stokes52
8ee879fcdb Add new leather motorcycle jacket 2020-11-11 11:06:06 -08:00
Leanfrog
f4fdd66844 added sol gov cap and tacticool turtleneck to loadout (#14703) 2020-10-25 15:11:40 -04:00
Darkmight9
4d5c368432 adds a wide varriety of new loadout options and some minor cost adjustments (#12873)
* adds a wide varriety of new loadout options and some minor cost adjustments

* forgot to enable the vox plushie

* Removed the contravercial items and added camera, kilt, and lizard plushie as choices

* Deconflicted and the unwanted items removed
2020-09-19 20:57:50 -04:00
variableundefined
87bb789ab1 Merge pull request #13096 from FreeStylaLT/cat_b_gone
Removes cat ears from the autodrobe vendor and loadout
2020-09-14 16:53:31 -04:00
Fox McCloud
fd1e880b0d Fixes Loadout Errors 2020-07-17 17:36:38 -04:00
Fox McCloud
5e7d484af6 Merge pull request #13827 from Autumn211/department_loadout_hats
Makes job gear have no overlap cost in loadout
2020-07-17 14:29:32 -04:00
Autumn211
2c1cd44795 Makes various job-specific gear not overlap cost 2020-07-15 20:07:43 +01:00
Autumn211
e763dd70af Makes job berets have no overlap cost in loadout 2020-07-13 16:06:24 +01:00
AffectedArc07
1676db7924 HOOKS ARE DEAD 2020-05-27 12:00:16 +01:00
FreeStylaLT
387e018b18 conflicts 2020-05-24 12:47:18 +03:00
Fox McCloud
82eae73521 Merge pull request #13143 from NotDhu/loadout-tweaks
Makes classic secHUD available to Magistrate
2020-05-16 17:21:44 -04:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
NotDhu
d2931c860b Makes classic secHUD available to Magistrate. 2020-03-18 14:21:43 -04:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
FreeStylaLT
ddbf3d3872 Also removes from loadout 2020-03-09 15:32:06 +02:00
Arvenius169
63c26fbf6f Update loadout_racial.dm 2020-01-02 20:36:14 -05:00
Arvenius169
40118846f4 Update loadout_racial.dm 2020-01-02 19:28:53 -05:00
Arvenius169
be9b931b0f embarassed 2019-12-30 03:24:18 -05:00
Arvenius169
a94916d5f3 Update loadout_racial.dm 2019-12-13 18:44:34 -05:00
Arvenius169
46ea323cf3 Update loadout_racial.dm 2019-12-13 18:40:26 -05:00
Arvenius169
f6c1a388a3 Racial Loadout Items Placement Fix 2019-12-11 15:29:07 -05:00
Fox McCloud
9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
0af85ab71d here we go 2019-08-26 06:07:35 -04:00
Fox McCloud
d0b4c61129 Loadout Updates 2019-08-26 01:36:47 -04:00
TheSardele
b58f7b3307 Allows pod pilots to start with security armbands
Adds Security Pod Pilots to the allowed roles list for the loadout security armband.
2019-07-18 14:21:10 +02:00
Kyep
78c67b9a1f patreon perks, admins, custom events 2019-04-28 03:40:50 -07:00
Ionward
0266c2fee2 fixed the display names in the loadout to fit alphabetical order better, and adjusted allowed list spacing 2019-04-09 21:12:25 -07:00
Ionward
4d754dde41 adjusted armor values and added options to the suit loadout menu 2019-04-09 20:49:14 -07:00
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00