cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 06:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,461 Commits 26 Branches 2 Tags
af2a3daf220100a9e60967e1fac3b1eafddd91e0
Commit Graph

175 Commits

Author SHA1 Message Date
warriorstar-orion
0ffa8303a7 Rename all non-snake_case types. (#27268) 
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
 2024-11-30 19:08:45 +00:00
Rowan Lea
9f26a62b30 Adds job overalls to the loadout menu (#27427) 
* Adds janitor's overalls to the loadout menu

* Adds ALL the overalls

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

Yay formatting

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Rowan Lea <5251535+Screampuff@users.noreply.github.com>

---------

Signed-off-by: Rowan Lea <5251535+Screampuff@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-11-29 14:32:10 +00:00
Chap
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743) 
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-13 13:02:29 +00:00
Ordosian
cd2cdd33f4 Plasmamen drip - Tacticool Suit (#27092) 
* Plasmaman Tactical Suits

Drip needed

* Clarification for dummies

* Radial Menu

* Removed the unneeded helmets.

* Desc Fix.

* Documentation and Static

* Unnecessary Check

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

* Documentation Fix

* Alt-Click better

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

* Better

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

* Initial for diver

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

* Contrabang requested changes.

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

* Requested Changes

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

* Update code/modules/clothing/spacesuits/plasmamen.dm

Requested Changes - Hands Blocked trait

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

---------

Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-11 13:04:17 +00:00
Aylong
ca50656a51 [TGUI] Loadout (#27026) 
* [TGUI] Loadout

* Loadout Tweaks

* Cleanup

* Almost there

* Allow to sort alphabetical

* UX tweaks

* Note and remove tweaks from scarf

* Oh fuck

* Ooops

* Sorting features

* Global search

* Rebuild

* Sure

* Rebuildo and some review changes

* TGUI REBUILDO!

---------

Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-11-09 08:04:53 +00:00
Spaghetti-bit
afd52f006a TGUI Color Picker (#26326) 
* Init

* Implements `tgui_input_color`

* Implements most color wheel conversions to TGUI

* Iteration two, went over titles and made sure most color inputs are functional.

* Implements preferences for large buttons, swapped buttons, and disabled TGUI

* Iteration three... the weird ones. (as null|color)

* Removes `as color|null` and `as null|color`

* Merge conflict resolution, again.

* Color input bundle and panel bundle

* CSLint being picky.

* Picky `while ()` instead of `while()`

* Apply suggestions from code review

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* WIP

* de-bri'ish colour into color

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Aylong review applied.
- Removed an extra space in machine.dm
- UI_STATE

+ Runechat color now uses TGUI_INPUT_COLOR

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Removes an unintentional space to `paradise.scss`

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Adds "is_color" regex from TG

* Fixes a few conflicting files

* TGUI Merge conflict moment v3

* V4?

* V5....

* God please don't explode. Builds TGUI like the linter wants.

* Update code/modules/tgui/tgui_input/color_input.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

* Rebuilds TGUI, again <3

* Lint be damned

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-07 21:24:45 +00:00
Bm0n
ade220d0cb Ports Jumpskirts! (#26935) 
* wip test 1

* sprites

* code added

* vendors and locker spawns set

* added to prisoner locker

* accidental deletion

* sprite fix

* Update code/modules/clothing/under/color.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* new kidan sprites

* Update code/modules/clothing/under/color.dm

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

* Update code/modules/clothing/under/color.dm

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

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-10-22 09:22:00 +00:00
Daniel Lenrd
de1250ab42 Adds and Adjusts Loadout Items (#26441) 
* Give Paramedic a medical beret

* Change path of Wardens' beret

* Give HOS and Warden loadout berets

* removes Barber from Service Armbands

* Gives Captain Procedure Armband

They are technically a Head of Procedure

* Gives Explorer Cargo Armband

* Gives Geneticist Research and Medical berets

* Gives Geneticist Research and Medical armbands

* Gives Virologist Medical armband

* Gives Detective Security beret

* Gives Shaft Miner Cargo beret

* Gives Explorer Cargo beret

* Gives Geneticist Research and Medical winter coats

* Gives CMO EMT armband

they can have EMT labcoat, they are trained professional, why not?

* Gives Geneticist Research and Medical bomber jackets
 2024-09-03 13:02:33 +00:00
McRamon
cc8aa14e9f Greyman Henley - Alternative to tacticool (and Dexter reference) (#26031) 
* sprites for test

* fixic

* species

* icon state

* fixies

* loadout and vendor

* palette update

* color update
 2024-07-03 03:47:01 +00:00
SynthTee
fa578375db REOPEN. Adds nanotrasen pin, pride pins and pride undershirts. (#25833) 
* be whoo you areee for your prideeeee. don't hideee

* nanotrasen pride nationwide

* Update code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-18 00:14:24 +00:00
Christasmurf
c84349aab3 Yet another Christasmurf bomber jacket PR (dmi split) (#25684) 
* dmisplit

* stinky new instance

* Apply suggestions from code review

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-06-12 18:18:43 +00:00
PollardTheDragon
dc8a586c19 Parlay? (#25866) 2024-06-12 07:03:26 +00:00
Christasmurf
0db4c22804 Cargo Technician resprite + some hazard vests (#25399) 
* cargotech and hazard vests

* deliveryboy and bomberjacket

* explorer merge changes
 2024-05-29 13:40:08 +00:00
Marm
5a68c5f6d3 Explorer Redux (#24202) 
* WE'RE SO BACK

* LET THERE BE SOUND

* More bugs

* fixes

* sound

* hmm

* clothing sprites + minor code changes to clothes

* meestake

* spritening

* YARR

* hiss

* Cyberiad explorer remap

* hand telover

* delta days

* rooms done

* VENDOR

* Mapping done

* Salvage mapped

* qol

* Forgot the hivelord.

* woops

* oops redux

* reviews and more

* consistency

* Update code/game/jobs/job_globals.dm

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

* character

* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

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

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

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

* Update code/game/objects/effects/spawners/random_spawners.dm

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

* Update code/modules/mob/living/simple_animal/hostile/pirate.dm

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

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

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

* Update code/game/objects/effects/spawners/random_spawners.dm

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

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

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

* Update code/modules/research/designs/machine_designs.dm

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

* some reviews

* Update code/game/machinery/constructable_frame.dm

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

* supply

* area repathing and ambience

* mapping

* metamapping

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* the doorening

* redooring

* modsuit

* more reviews

* the plasmamamninigngg

* add random salvage generation across space ruins

* add blackbox tracking for salvage sold

* gun

* deconflicts and reviews

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* all conversations resolved

* maybe work now?

* please no more, too many apcs

* Update code/modules/mob/living/simple_animal/corpse.dm

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

* Update code/modules/mining/machine_vending.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

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

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

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

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

* henri review + action figure

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

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

* PDA

* conflicts

* more conflicts

* maybe all conflcits?

* wait fuck

* maybe fixed???

* KIDAN SPRITES

* MAYBE?

* access fixes

* explorer hotfixes 1:

- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room

* add salvage selling back

* NOT FOR SALE

* oh my god actually sell the fucking salvage this time

* maybe fine now?

* carpover

* NO MORE CABLE

* balance tweaks

* some depot loot updates

* merge conflict

* deconflicted???

* woops more oversights

* skirts, bombers, exploredrobe code + sprites

* woops (again)

* deconflicting

* remove old explorer room again

* Hat fix

* minor changes to sprites and code for hats

* yarrr fix 1

* first fixes

* don't drop loot from syndies gibbed by depot destruction

* add selling back with new signal based system

* speedmerge this shit

* minor changes to collars/bomber resprite

* docking port in

* ruins

* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN

* no more murder hallway on whiteship

* undelete meson sunglasses, redelete uristrunes

* BOOTY BAGS

* don't drop ashdrake loot from crusher kills

* box: fix ntrep fax, add explorer access to ORMroom

* add meson sunglasses item icon back

* fix cere handtele, meta shutter control, death sound arg

* cleaning up

* she mosins on my russian till i dj station

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

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>

* mapping

* Cleaning up

* revert changes in tools/{bootstrap,ci}

---------

Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-05-27 19:27:59 +00:00
Gatchapod
9afec80430 Less scuffed Tajaran veils (#24701) 
* Tajaran enveilening

* Fix load name, swap to Initialize, more OOP

* Addressing reviews, small redoing of desc

* Suggested changes

* changes suggested by lewcc

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-17 12:44:34 +00:00
AffectedArc07
69f20e250b Removes Nanomob (#25417) 
* Nukes nanomob

* Forgot this

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-14 09:29:38 +00:00
Christasmurf
d587effe2c Beret + softcap .dmi split (#25314) 
* beret softcap dmi split

* icon rename

* dme crlf to lf

* tsf cap fixes

* Apply suggestions from code review

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

* vox cap icon name

* remove beret subtype on fluff

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

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-02 11:37:44 +00:00
DGamerL
bad8b31afa Changes all .len to length() where applicable (#25174) 
* Globals work

* Double access works

* All other things

* Revert "All other things"

This reverts commit 6574442eb6.

* More changes that compile and work

* IT WORKS AAAAAA

* Changes even more .len to length()

* Apply suggestions from code review

* Update code/datums/mind.dm

* Update code/__HELPERS/sorts/InsertSort.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Update code/__HELPERS/sanitize_values.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-04-19 17:32:09 +00:00
McRamon
d18cebac6e Cowboy hats resprite (#24611) 
* human_mob

* items

* grey_mob

* drask_mob

* vox_mob

* code, lets fucking hope i didnt forget anything

* i forgot stupid fuckign shit

* also i love to delete wrong things

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

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

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* moved to other cowboy hats

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-03-20 20:23:54 +00:00
McRamon
d02d54bfd4 Security poncho (#24614) 
* all at once

* no

* ah yes

* minor pixel adjustments

* moved

* Update code/modules/clothing/suits/armor_suits.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-20 19:55:59 +00:00
Christasmurf
03f66b19cc Quartermaster Drip (#24341) 
* quartermasterdrip

* Update code/modules/clothing/head/job_hats.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: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-11 15:05:27 -04:00
McRamon
046c841cab New plasmaman suit - Coke Suit (#24465) 
* all done????

* no

* ave emperor

* aaaand last pixel adjsutment

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

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

* box name

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

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

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-10 18:19:55 +00:00
Christasmurf
7dd4ecf151 Janitorial Drip (#24141) 
* custodial time

* balls ass

* drask glove fix

* drask sleeve adjustment
 2024-02-27 17:37:16 -05:00
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