Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added two new trucker hats, new latex glove sprites, new shoe sprites and new medical scrub sprites. #5642

Merged
merged 6 commits into from
Feb 6, 2024
Merged

Added two new trucker hats, new latex glove sprites, new shoe sprites and new medical scrub sprites. #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f50e62a
Clash Royal. HA-HA-HA
Feb 2, 2024
977f6c3
Adds the light blue scrubs to the others.
Feb 2, 2024
772092f
Final fixes
Feb 2, 2024
fb59479
Fix
Feb 2, 2024
683a72b
Sprite errors
Feb 2, 2024
d04551d
Insane
Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/medical.dm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/hands.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/hats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/shoes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/suits.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
View file
Open in desktop
Binary file not shown.
Loading