Skip to content

Commit

Permalink
Added two new trucker hats, new latex glove sprites, new shoe sprites…
Browse files Browse the repository at this point in the history
… and new medical scrub sprites. (#5642)

# About the pull request

Added a blue and red trucker hat

Updated the latex glove sprites.

Updated the laceup, sneaker, sandals and marine boots sprites.

Changed the medical scrubs, including adding a new orange scrubs sprite
along with removing the nurse armband from the nurse scrubs and making
it an accessory with a new sprite.



# Explain why it's good for the game

Two new trucker hats for that epic survivor gameplay.

Alot of new medical sprites, the scrubs, the headscrubs and the new
apron.

Aswell as new sprites for laceup shoes, sneakers and black/brown/jungle
marine boots.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

(The Medical Scrubs)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/d23579bf-3215-48c6-9ef7-b8c80bc75e7f)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/1090c121-237f-4fc9-a502-c9a452a07796)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/5da01235-5f94-4dad-afcd-c66bb9b0a380)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/26374a04-a4d9-4cf2-9c89-eeaa16c1c3b7)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/aadabeed-ced1-44bb-93e8-1a479978e167)

(The Trucker Hats)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/b39bf7cc-875c-4e7a-b098-e5deddaebcb8)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/fa4a4dfd-6bd3-4f6a-8cd3-dd3b274a3140)

(The Sandals)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/25ce45f7-18a9-43bf-9b3d-96fb09bafb3b)

(The Marine Boots)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/35c06058-3841-4cfe-9c5f-919ecd5cb056)



![image](https://github.com/cmss13-devs/cmss13/assets/79063506/244b0687-6f9c-4456-b350-ab374c27f05c)



![image](https://github.com/cmss13-devs/cmss13/assets/79063506/d4c77d4d-b19f-4c6d-9652-9158a7d53428)

(The Laceups)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/56221396-b495-4618-8691-eee7540544a8)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/4282d7a0-9d91-4c68-b3d6-15389bf2c925)


</details>


# Changelog
:cl:
add: Added light blue scrubs to the medical and synth vendors and
closets
imageadd: added two trucker hat sprites, blue and red
imageadd: added new latex, laceup, sneakers, sandals and marine boot
sprites.
imageadd: added new medical apron, new scrub uniforms and scrub
headcover sprites, including a new orange one.
imagetweak: tweaked the wizard sandal name to good old sandals
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson committed Feb 6, 2024
1 parent e33244d commit a15efa9
Show file tree
Hide file tree
Showing 23 changed files with 43 additions and 11 deletions.
4 changes: 3 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list(
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
Expand Down Expand Up @@ -106,7 +107,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list(
list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY),

list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Medical Nurse Scrubs", 0, /obj/item/clothing/under/rank/medical/nurse, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -178,6 +179,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
list("Researcher Uniform", 0, /obj/item/clothing/under/marine/officer/researcher, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("Doctor Uniform", 0, /obj/item/clothing/under/rank/medical, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("SUIT (CHOOSE 1)", 0, null, null, null),
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("USCM UNIFORMS", 0, null, null, null),
list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/storage/belt/medical/full(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/head/surgery/green(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/head/surgery/blue(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/shoes/white(src)
Expand Down
12 changes: 12 additions & 0 deletions code/modules/clothing/head/soft_caps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@
cap_color = "ferret"
black_market_value = 25

/obj/item/clothing/head/soft/trucker
name = "\improper blue trucker hat"
desc = "It's a blue trucker hat."
icon_state = "truckercap_bluesoft"
cap_color = "truckercap_blue"

/obj/item/clothing/head/soft/trucker/red
name = "\improper red trucker hat"
desc = "It's a red trucker hat."
icon_state = "truckercap_redsoft"
cap_color = "truckercap_red"

/obj/item/clothing/head/soft/sec
name = "security cap"
desc = "It's baseball hat in tasteful red color."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
/obj/item/clothing/shoes/sandal
desc = "A pair of rather plain, wooden sandals."
name = "sandals"
icon_state = "wizard"
icon_state = "sandals"
flags_armor_protection = 0

/obj/item/clothing/shoes/sandal/marisa
Expand Down
19 changes: 13 additions & 6 deletions code/modules/clothing/under/jobs/medsci.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
item_state_slots = list(WEAR_BODY = "medical")

/obj/item/clothing/under/rank/medical/nurse
name = "medical nurse scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one features an orange armband."
icon_state = "scrubsnurse"
item_state = "scrubsnurse"
item_state_slots = list(WEAR_BODY = "scrubsnurse")
/obj/item/clothing/under/rank/medical/lightblue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in light blue."
icon_state = "scrubslightblue"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubslightblue")

/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
Expand All @@ -204,6 +204,13 @@
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubspurple")

/obj/item/clothing/under/rank/medical/orange
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in prisoner orange."
icon_state = "scrubsorange"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsorange")

/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist."
name = "psychiatrist's jumpsuit"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,11 @@
desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
icon_state = "medgreen"

/obj/item/clothing/accessory/armband/nurse
name = "nurse armband"
desc = "An armband, worn by the rookie nurses to display they are still not doctors. This one is dark red."
icon_state = "nurse"

//patches
/obj/item/clothing/accessory/patch
name = "USCM patch"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1310,8 +1310,8 @@
/obj/item/clothing/shoes/marine/fluff/vintage //CKEY=vintagepalmer
name = "Vintage Sandals"
desc = "Vintage Sandals, suitable for only the highest class of hipster. DONOR ITEM"
icon_state = "wizard"
item_state = "wizard"
icon_state = "sandals"
item_state = "sandals"

/obj/item/clothing/shoes/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Shoes"
Expand Down
3 changes: 2 additions & 1 deletion code/modules/gear_presets/uscm_medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
back_item = /obj/item/storage/backpack/marine

new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/nurse(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/armband/nurse(new_human), WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)


Expand Down
Binary file modified icons/mob/humans/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/hands.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit a15efa9

Please sign in to comment.