Commit Graph

152 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
Christasmurf
cae6017c48 Bomber Jacket resprite + departmental expansion (#23599)
* bomberjackets

* Apply suggestions from code review

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

* minor changes to armour and allowed items

* secbomber description change

* more allowed item tweaks

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-06 21:46:14 +00:00
Christasmurf
95c46662c5 Entertainer Drip (Mime/Clown) (#23546)
* entertainerdrip

* duffelshadingitem
2023-12-28 22:39:36 +00:00
Sadhorizon
d3ff8c9921 Resprites lockets, makes necklaces craftable. (#23387)
* lockets!

* this shouldn't need directionals, actually
2023-12-11 16:56:44 +00:00
Daniel Lenrd
dcc927ae1f Goggles Added to Point System (#23382) 2023-12-06 15:35:50 +00:00
Sadhorizon
5f479ea457 Adds a new drip option - cloth handwraps! (#23339)
* drip

* this is unneeded actually

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

sure.

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

* flips item sprite
for now, at least

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:34:15 +00:00
Christasmurf
1f87a821e1 Head of Personnel drip (#23305)
* everything

* dress sprite adjust

* grey coat

* Update code/modules/clothing/under/jobs/civilian.dm

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

* corgi time

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:32:16 +00:00
Contrabang
c8dce33a8a Cleans up a lot of globals a few other vars (#23246)
* i hate globals i hate globals

* more fucking of these

* sirryan review
2023-12-06 15:30:41 +00:00
Nathan Winters
0bbc523dad Adds colored shoes to loadout, makes satchels craftable (#23293)
* Add colored shoes to loadout

* Allow crafting of satchels
2023-11-24 15:38:12 +00:00
Christasmurf
060149ca7c armband and stuff (#23224) 2023-11-14 12:46:57 +00:00
Daniel Lenrd
2b67a00131 Adds HOP beret (#22919)
* Added HOP Beret

* adjusted beret object sprite

* proper variable order style

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

* added Vox & Drask Version

* Added to loadout

* checkout new hats

* re-add newer hat

* put actual hat path in loadout

* Not used the cool merging tool made in python

* apostrophes are for captains only

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

* adds sprite sheet

I think it worked fine without it?

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-08 08:51:37 +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
PollardTheDragon
7480179907 Adds Vox Jumpsuits to Loadout Screen - Rebuilt PR #22537 to fix DMI Conflict (#22694)
* Rebuilt PR #22537 to fix DMI Conflict

* Removed Coverage Limitation on Vox Jumpsuit

* Revised Descriptions for Vox Clothes to fit lore

* Grammar Fixes

* Adjusted Loadout Descriptions to match

* Onboard, not Aboard.
2023-10-28 21:24:42 +02:00
Christasmurf
eed4890be5 white beret (#23013) 2023-10-27 20:19:45 +01:00
Christasmurf
5b6a2de4ca Procedure dmi split + IAA resprite (#22580)
* dmi split and code stuff - species sprites coming soon(tm)

* species sprites

* update sprite name

* CI errors?

* CRLF to LF

* forgor species code

* Update code/modules/clothing/under/jobs/procedure.dm

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

* readds the ability to make cluwnes (how did this happen)

* fuck off shitcode breaking my shit

* Apply suggestions from code review

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

* forgor to delet extra sprites

* Suggestion

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* booleans

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:31:38 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
McRamon
7cd7102663 Deliveryboy (#22185)
* sprites

* code1

* test

* more code and testings done

* i am loosing it

* if only i didnt make stupid mistakes

* good boy can be delivery boy

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

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

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

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

* Update code/modules/clothing/head/soft_caps.dm

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

* Update code/modules/clothing/under/jobs/cargo.dm

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

* Apply suggestions from code review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-20 14:19:10 +01:00
Christasmurf
c7380ae905 Science beret sprites (#22178)
* scienceberets

* black beret

* suggested change

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2023-09-13 11:45:28 +01: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
Medster
06b76b6f0b Adds the Assistant's formal uniform to the loadout Menu (#21697)
* Adds the Assistnat's formal uniform to the loadout
menu, Im finally a coder, time to cry in a corner

* adds punctuation for consitancy
2023-07-24 15:52:26 +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
cybercapitalism
f2cfa470db adds detective to sleek veil whitelist (#21247) 2023-06-14 21:11:10 +01:00
Henri215
a5efbd32e8 USSP update part 2 (#20926)
* USSP part 2

* swapping old version for new one in some places
2023-05-02 21:59:01 +02:00
Christasmurf
330180c83e Dignitary drip - Magistrate, NT Rep, Blueshield (#20438)
* dignitary, human, items, spawning

* garment bag update

* dignitary icons

* ntrep cap

* gloves and hat fix

* dignitary icons part 2 and misc code

* minor stuff

* hat fix from updates also drask and grey suit slot

* minor description discrepancy

* cane resprite
2023-03-02 09:15:35 +00:00
Christasmurf
db6b994911 Bomber jacket loadout changes - Job subtypes and adds engi/atmos to loadout options (#19723)
* loadout options

* bomber job subtype changes

* display name consistency

* spacing aaaaaaa
2022-11-24 22:46:01 +01:00
McRamon
56b8b1ece4 Hawaiian loadout (#19685)
* does this work?

* maybe this will work?

* fix

* dots of consistency

* removal of what was asked to be removed
2022-11-18 20:40:09 +00:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
ElorgRHG
e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
2022-09-17 11:13:58 +01:00
Christasmurf
8a47325d33 Cargo/Mining bomber jackets, minor tweaks to allowed items in cargo wintercoats (#18914)
* cargo and mining bombers and stuff

* changes requested

* reorder loadout
2022-09-07 13:37:15 +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
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