Skip to content

Commit

Permalink
Adds a bunch of stuff to the loadout. (#3258)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds most stuff from [this
thread](https://discord.com/channels/837744059291533392/1238828290626814022)
(plus some personal choices) to the loadout.

Accessories:
- red bandana (moved from general)
- skull bandana
- black bandana
- blue bandana
- surgical mask (moved from general)
- balaclava (moved from general)
- headphones
- pocket protector

Eyewear:
- double eyepatch

Footwear:
- brown/black/white cowboy boots

General:
- deck of KOTAHI cards
- fountain pen
- polaroid camera
- pAI (added a description to it, it had a blank)
- cane (removed the clown part of the desc)

Headwear:
- black beret
- white/beige fedora
- black/blue/green/orange/purple/red beanie
- bowler hat
- black/blue/grey/white/red cap

External wear:
- red/gray/blue suspenders (desc tweaked for red ones because mimes are
dead)
- longcoat
- hazard vest

Uniforms:
- nothing new - it's filled to the brim anyways

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
There's been a removal, time for additions. More options good, probably.

**Want something else to make it to the loadout? Or maybe you are
opposed to something from these being in it? Comment it I guess.**
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: Added a bunch of new items to the loadout.
tweak: Changed the description of red suspenders.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Sadhorizon authored Aug 25, 2024
1 parent 5c2b00a commit ec70374
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 25 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301

/obj/item/cane
name = "cane"
desc = "A cane used by a true gentleman. Or a clown."
desc = "A cane used by a true gentleman."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "cane"
item_state = "stick"
Expand Down
39 changes: 39 additions & 0 deletions code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,36 @@
path = /obj/item/clothing/accessory/bonearmlet
slot = null

//Masks

/datum/gear/accessory/mask
subtype_path = /datum/gear/accessory/mask
slot = ITEM_SLOT_MASK

/datum/gear/accessory/mask/bandana/red
display_name = "bandana, red"
path = /obj/item/clothing/mask/bandana/red

/datum/gear/accessory/mask/bandana/skull
display_name = "bandana, skull"
path = /obj/item/clothing/mask/bandana/skull

/datum/gear/accessory/mask/bandana/black
display_name = "bandana, black"
path = /obj/item/clothing/mask/bandana/black

/datum/gear/accessory/mask/bandana/blue
display_name = "bandana, blue"
path = /obj/item/clothing/mask/bandana/blue

/datum/gear/accessory/mask/surgical
display_name = "surgical mask"
path = /obj/item/clothing/mask/surgical

/datum/gear/accessory/mask/balaclava
display_name = "balaclava"
path = /obj/item/clothing/mask/balaclava

//Misc

/datum/gear/accessory/waistcoat
Expand All @@ -103,3 +133,12 @@
display_name = "stethoscope"
path = /obj/item/clothing/neck/stethoscope
allowed_roles = list("Medical Doctor", "Chief Medical Officer")

/datum/gear/accessory/headphones
display_name = "headphones"
slot = ITEM_SLOT_EARS
path = /obj/item/instrument/piano_synth/headphones

/datum/gear/accessory/pocketprotector
display_name = "pocket protector"
path = /obj/item/clothing/accessory/pocketprotector
5 changes: 4 additions & 1 deletion code/modules/client/loadout/loadout_eyewear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@
description = "A blindfold you can still see through."
path = /obj/item/clothing/glasses/trickblindfold


/datum/gear/eyewear/doubleeyepatch
display_name = "double eyepatch"
description = "Two eyepatches at once! Effectively a blindfold, though."
path = /obj/item/clothing/glasses/blindfold/eyepatch

/datum/gear/eyewear/glasses/cold
display_name = "cold goggles"
Expand Down
14 changes: 14 additions & 0 deletions code/modules/client/loadout/loadout_footwear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,17 @@
/datum/gear/footwear/color/white
display_name = "white shoes"
path = /obj/item/clothing/shoes/sneakers/white

//Cowboy boots

/datum/gear/footwear/cowboy
display_name = "cowboy boots, brown"
path = /obj/item/clothing/shoes/cowboy

/datum/gear/footwear/cowboy/black
display_name = "cowboy boots, black"
path = /obj/item/clothing/shoes/cowboy/black

/datum/gear/footwear/cowboy/white
display_name = "cowboy boots, white"
path = /obj/item/clothing/shoes/cowboy/white
28 changes: 13 additions & 15 deletions code/modules/client/loadout/loadout_general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
display_name = "lipstick, red"
path = /obj/item/lipstick

/datum/gear/balaclava
display_name = "balaclava"
path = /obj/item/clothing/mask/balaclava

/datum/gear/vape
display_name = "vape"
path = /obj/item/clothing/mask/vape
Expand All @@ -26,10 +22,6 @@
display_name = "e-cigar"
path = /obj/item/clothing/mask/vape/cigar

/datum/gear/bandana
display_name = "bandana, red"
path = /obj/item/clothing/mask/bandana/red

/datum/gear/flask
display_name = "flask"
path = /obj/item/reagent_containers/food/drinks/flask
Expand Down Expand Up @@ -58,12 +50,17 @@
display_name = "toy, deck of cards"
path = /obj/item/toy/cards/deck

/datum/gear/kotahi
display_name = "toy, deck of KOTAHI cards"
path = /obj/item/toy/cards/deck/kotahi

/datum/gear/eightball
display_name = "toy, magic eight ball"
path = /obj/item/toy/eightball

/datum/gear/pai
display_name = "personal AI device"
description = "A synthetic friend that fits in your pocket."
path = /obj/item/paicard

/datum/gear/tablet
Expand All @@ -86,6 +83,10 @@
display_name = "pen, four-color"
path = /obj/item/pen/fourcolor

/datum/gear/fountainpen
display_name = "pen, fountain"
path = /obj/item/pen/fountain

/datum/gear/paperbin
display_name = "paper bin"
path = /obj/item/paper_bin
Expand Down Expand Up @@ -127,7 +128,6 @@
display_name = "toy, rilena tali plushie"
path = /obj/item/toy/plush/tali

// Shiptest edit
/datum/gear/amongus
display_name = "toy, suspicious pill plushie"
path = /obj/item/toy/plush/among
Expand All @@ -150,8 +150,6 @@
display_name = "table bell, brass"
path = /obj/item/table_bell/brass

// End Shiptest

/datum/gear/flashlight
display_name = "tool, flashlight"
path = /obj/item/flashlight
Expand All @@ -160,11 +158,11 @@
display_name = "tool, emergency crowbar"
path = /obj/item/crowbar/red

/datum/gear/surgical_mask
display_name = "surgical mask"
path = /obj/item/clothing/mask/surgical

/datum/gear/rilena_poster
display_name = "poster, rilena"
path = /obj/item/poster/random_rilena
description = "A random poster of the RILENA series."

/datum/gear/camera
display_name = "polaroid camera"
path = /obj/item/camera
73 changes: 68 additions & 5 deletions code/modules/client/loadout/loadout_hat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
display_name = "beret, red"
path = /obj/item/clothing/head/beret

/datum/gear/hat/beret/black
display_name = "beret, black"
path = /obj/item/clothing/head/beret/black

/datum/gear/hat/beret/departmental
display_name = "beret, departmental"
path = /obj/item/clothing/head/beret/grey
Expand Down Expand Up @@ -74,24 +78,83 @@
path = /obj/item/clothing/head/beret/eng/hazard
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer")

//Soft caps

/datum/gear/hat/softcap/red
display_name = "cap, red"
path = /obj/item/clothing/head/soft/red

/datum/gear/hat/softcap/blue
display_name = "cap, blue"
path = /obj/item/clothing/head/soft/blue

/datum/gear/hat/softcap/grey
display_name = "cap, grey"
path = /obj/item/clothing/head/soft/grey

/datum/gear/hat/softcap/white
display_name = "cap, white"
path = /obj/item/clothing/head/soft/mime

/datum/gear/hat/softcap/black
display_name = "cap, black"
path = /obj/item/clothing/head/soft/black

//Beanies

/datum/gear/hat/beanie
display_name = "beanie, white"
path = /obj/item/clothing/head/beanie

/datum/gear/hat/beanie/black
display_name = "beanie, black"
path = /obj/item/clothing/head/beanie/black

/datum/gear/hat/beanie/red
display_name = "beanie, red"
path = /obj/item/clothing/head/beanie/red

/datum/gear/hat/beanie/green
display_name = "beanie, green"
path = /obj/item/clothing/head/beanie/green

/datum/gear/hat/beanie/purple
display_name = "beanie, purple"
path = /obj/item/clothing/head/beanie/purple

/datum/gear/hat/beanie/blue
display_name = "beanie, blue"
path = /obj/item/clothing/head/beanie/darkblue

/datum/gear/hat/beanie/orange
display_name = "beanie, orange"
path = /obj/item/clothing/head/beanie/orange
//Misc

/datum/gear/hat/bowler
display_name = "bowler hat"
path = /obj/item/clothing/head/bowler

/datum/gear/hat/that
display_name = "top hat"
path = /obj/item/clothing/head/that

/datum/gear/hat/fedora
display_name = "fedora"
display_name = "fedora, black"
path = /obj/item/clothing/head/fedora

/datum/gear/hat/fedora/white
display_name = "fedora, white"
path = /obj/item/clothing/head/fedora/white

/datum/gear/hat/fedora/beige
display_name = "fedora, beige"
path = /obj/item/clothing/head/fedora/beige

/datum/gear/hat/flatcap
display_name = "flatcap"
path = /obj/item/clothing/head/flatcap

/datum/gear/hat/beanie
display_name = "beanie"
path = /obj/item/clothing/head/beanie

/datum/gear/hat/wig
display_name = "wig"
path = /obj/item/clothing/head/wig
Expand Down
23 changes: 21 additions & 2 deletions code/modules/client/loadout/loadout_suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@
display_name = "suit jacket, charcoal"
path = /obj/item/clothing/suit/toggle/lawyer/charcoal

/datum/gear/suit/jacket/navy //why is this blank? i dont know

/datum/gear/suit/jacket/hoodie_black
display_name = "hoodie, black"
path = /obj/item/clothing/suit/hooded/hoodie/black
Expand Down Expand Up @@ -93,6 +91,19 @@
display_name = "hazard jacket"
path = /obj/item/clothing/suit/toggle/hazard

//Suspenders
/datum/gear/suit/suspenders/red
display_name = "suspenders, red"
path = /obj/item/clothing/suit/toggle/suspenders

/datum/gear/suit/suspenders/blue
display_name = "suspenders, blue"
path = /obj/item/clothing/suit/toggle/suspenders/blue

/datum/gear/suit/suspenders/gray
display_name = "suspenders, gray"
path = /obj/item/clothing/suit/toggle/suspenders/gray

//Misc
/datum/gear/suit/grponcho
display_name = "poncho, green"
Expand All @@ -119,3 +130,11 @@
display_name = "floral shirt"
description = "From grills to guns, this shirt's seen it all."
path = /obj/item/clothing/suit/hawaiian

/datum/gear/suit/hazardvest
display_name = "hazard vest"
path = /obj/item/clothing/suit/hazardvest

/datum/gear/suit/longcoat
display_name = "longcoat"
path = /obj/item/clothing/suit/longcoat
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
//Mime
/obj/item/clothing/suit/toggle/suspenders
name = "suspenders"
desc = "They suspend the illusion of the mime's play."
desc = "The symbol of hard labor and dirty jobs."
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
blood_overlay_type = "armor" //it's the less thing that I can put here
Expand Down

0 comments on commit ec70374

Please sign in to comment.