Commit Graph

29 Commits

Author SHA1 Message Date
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
Aylong
37879c530b Boxes new sprites & little refactor (#23213)
* Sprites and little refactor

* idk what i am doing

Maybe refactor

* Sort the boxes

* Matches path

* Script and maps

* Okay... that was a strange decision.

* bathroom parts box

* More boxes

* Henri review changes

* Update toy.dmi

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update storage.dmi

* Update boxes.dmi

* True conflict solve

I hope

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-01-06 23:31:36 +00:00
Daniel Lenrd
dcc927ae1f Goggles Added to Point System (#23382) 2023-12-06 15:35:50 +00:00
Sadhorizon
3c5bd10f79 pAIs_in_loadout (#22132) 2023-11-08 08:49:14 +00:00
Pineapple Salad
8e6defe682 Adds HUD goggles and basic goggles (#22864)
* Added HUD goggles

* Added HUD goggles and species variants

* Adds HUD goggles with species variants (fixed)

* Update code/modules/client/preference/loadout/loadout_general.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* makes hud goggles craftable and adds to vendor

* changed dmi name to goggles

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/crafting/tailoring.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-03 20:27:29 +00:00
Burzah
67901058ae Unum! The card game. (#22152)
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:18:37 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
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
SabreML
5ed4c3ca83 Loadout Instruments (#15633) 2021-07-08 22:57:54 +01:00
Mitchs98
7696ca8b69 adds synth to loadout (#14988) 2020-12-16 14:07:14 -05:00
meow20
788eac4392 Update loadout_general.dm 2020-11-11 22:23:20 +01: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
NotDhu
d2931c860b Makes classic secHUD available to Magistrate. 2020-03-18 14:21:43 -04:00
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
FalseIncarnate
96c615132a Adds departmental and head of staff mugs
Adds mugs for each department to the loadout.
- The service mug is available to all jobs

Adds mugs for heads of staff, found in their respective locker.
- CE, RD, CMO, HoS, HoP, Captain

Moved mugs to their own loadout category
2018-01-25 01:52:04 -05:00
FalseIncarnate
23c883bd57 Coffee Mugs and Vendor Change
Adds coffee mugs
- Available from hot drink vendors or loadout menu (1 point)

Adds novelty coffee mugs
- Available as a premium item from the hot drinks vendors or from the
loadout menu (2 points)

Adds support for an "item slot" in vendors, which allows an item to be
inserted into a vendor.

Adds the ability to add containers into the hot drinks machine.
- Will attempt to fill the inserted container with purchased beverages.
- Excess will still dispense in a new cup, as if there was not a
container present.

🆑
rscadd: Adds coffee and novelty mugs to the hot drinks machine and
loadout menu.
rscadd: Adds the ability to insert containers into the hot drink
machine, filling the container with your purchase.
/🆑
2018-01-22 22:46:03 -05:00
FalseIncarnate
cddc7cb340 Nano-Mob Hunter GO! WIP commit 3: The committening 2016-09-06 04:15:44 -04:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Mieszko Jędrzejczak
452ce45470 Adds things, things. 2016-07-23 22:20:40 +02:00
Mieszko Jędrzejczak
52fbdd48b6 Adjusts. 2016-07-13 03:53:14 +02:00
Mieszko Jędrzejczak
932bbc7016 vox coat sprites, things 2016-07-07 17:42:20 +02:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
Tigercat2000
e91bd14fc6 Bay/Polaris loadouts
Basics
 - Allows you to select up to 10 items in the character menu
 - Saved per-character
 - The items will be spawned when you join
 - Some items may have job limitations

Included Items
 - Accessories
   - Scarf
   - Black Scarf
   - Christmas Scarf
   - Dark Blue Scarf
   - Green Scarf
   - Light Blue Scarf
   - Orange Scarf
   - Purple Scarf
   - Red Scarf
   - Striped Blue Scarf
   - Striped Green Scarf
   - Striped Red Scarf
   - White Scarf
   - Yellow Scarf
   - Zebra Scarf
 - Cosmetics
   - Blue lipstick
   - Jade lipstick
   - Purple lipstick
   - Red lipstick
 - General
   - d20
 - Uniforms and Casual Dress
   - Blue Plaid Skirt
   - Purple Plaid Skirt
   - Red Plaid Skirt
   - Atmospherics Skirt
   - Black Skirt
   - Cargo Skirt
   - Chemist Skirt
   - CMO Skirt
   - Engineer Skirt
   - HOS Skirt
   - Medical Skirt
   - QM Skirt
   - Roboticist Skirt
   - Scientist Skirt
   - Security Skirt
   - Virologist Skirt
   - Warden Skirt
2016-05-11 13:00:23 -07:00