Skip to content

Commit

Permalink
Another good Sprite PR (#5681)
Browse files Browse the repository at this point in the history
# About the pull request

Adds new insulated sprites for both the item and on-mob

Adds new CMB uniform/jacket/cap sprites, as well as a deputy/marshal
variant.

Adds two new overall sprites, tan/red and updates the blue one.

Gives two heavy vehicle operator survs a blue/red trucker hat I added
previously.

Adds three new hazard vest sprites. Orange/Blue/Black

Adds five new colonist workclothes. Grey/Khaki/Pink/Blue/Green

# Explain why it's good for the game

Removes legacy sprites, adds new sprites and puts said sprites in
rotation.


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

### CMB Deputy and Marshal


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/8e56cfd1-b2b1-4a66-9bbe-79ff35af0959)



![image](https://github.com/cmss13-devs/cmss13/assets/79063506/7bb2ca88-ddef-4fb0-97e1-bf1b68cd01c8)

### Hazard Vests and Insulated Gloves


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/0ba75249-984b-4c20-9685-12d7c9a0bcc0)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/d58766a9-a40d-467b-ac68-38249f9571ca)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/51ff0d16-b1a3-4fa2-974d-78f1c9995279)

### Workwear


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/3a747679-6f50-4e64-8054-1766ce3be8e8)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/3f4965c8-1472-497c-956f-05b1cd9729e5)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/40d6cbfd-ac95-4839-bf2b-11d320732755)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/b7c9e8b7-178f-442b-8a7e-356d942f9cc8)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/f3199711-696e-49e6-903a-5b7a0c3be370)

### Overalls


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/27489308-3c60-42ca-a8e8-aaa854b0eabf)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/dcd1fe5d-79d6-467d-afee-d46303186e24)


![image](https://github.com/cmss13-devs/cmss13/assets/79063506/9b1f6194-ba31-4149-a157-80e1a0fcc460)


</details>


# Changelog
:cl:
add: Added trucker hats to the Solaris and Trijent Trucker survs.
add: Added the CMB Marshal jacket to the CMB Marshal.
imageadd: Differentiated the CMB Deputy and CMB Marshal jackets to
accurately know which is which. Courtesy of AmoryBlaine.
imageadd: Added new insulated gloves, coveralls (Tan/Red), updated the
blue coveralls, Five Colonist Clothes (Grey/Khaki/Pink/Blue/Green),
updated the Orange/Blue/Black hazard vests and updated the CMB Uniform
and Cap. Courtesy of AmoryBlaine.
/:cl:

---------

Co-authored-by: Jeff Watchson <[email protected]>
  • Loading branch information
BadAtThisGame302 and Jeff Watchson committed Feb 26, 2024
1 parent a60a7c7 commit 64d528e
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 11 deletions.
10 changes: 8 additions & 2 deletions code/modules/clothing/suits/marine_armor/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,10 @@
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS

/obj/item/clothing/suit/storage/CMB
name = "\improper CMB jacket"
desc = "A black jacket worn by Colonial Marshals. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
name = "\improper CMB Deputy jacket"
desc = "A thick and stylish black leather jacket with a Marshal's Deputy badge pinned to it. The back is enscribed with the powerful letters of 'DEPUTY' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
icon_state = "CMB_jacket"
item_state = "CMB_jacket"
blood_overlay_type = "coat"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS
Expand Down Expand Up @@ -531,6 +532,11 @@
)
pockets.max_storage_space = 8

/obj/item/clothing/suit/storage/CMB/marshal
name = "\improper CMB Marshal jacket"
desc = "A thick and stylish black leather jacket with a Marshal's badge pinned to it. The back is enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol."
icon_state = "CMB_jacket_marshal"
item_state = "CMB_jacket_marshal"

//===========================//HELGHAST - MERCENARY\\================================\\
//=====================================================================\\
Expand Down
16 changes: 14 additions & 2 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)

/obj/item/clothing/suit/storage/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
name = "blue coveralls"
desc = "A pair of denim overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
icon_state = "overalls"
item_state = "overalls"
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
Expand All @@ -167,6 +167,18 @@
)
valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL)

/obj/item/clothing/suit/storage/apron/overalls/tan
name = "tan coveralls"
desc = "A pair of tan overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
icon_state = "overalls_tan"
item_state = "overalls_tan"

/obj/item/clothing/suit/storage/apron/overalls/red
name = "red coveralls"
desc = "A pair of reddish-brown overalls. With a large pocket in the front these overalls are popular with workers of all kinds."
icon_state = "overalls_red"
item_state = "overalls_red"

/obj/item/clothing/suit/syndicatefake
name = "red space suit replica"
icon_state = "syndicate"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/under/gimmick.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
has_sensor = UNIFORM_NO_SENSORS
displays_id = 0

item_icons = list(
WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
)

//JASON
/obj/item/clothing/under/gimmick/jason
name = "dirty work attire"
Expand Down
39 changes: 37 additions & 2 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,40 @@
has_sensor = UNIFORM_HAS_SENSORS
sensor_faction = FACTION_COLONIST

/obj/item/clothing/under/colonist/workwear
name = "grey workwear"
desc = "A pair of black slacks and a short-sleeve grey workshirt. Standard uniform for Weyland Yutani employees working in colony operations and administration."
icon_state = "workwear_grey"
worn_state = "workwear_grey"

/obj/item/clothing/under/colonist/workwear/khaki
name = "khaki workwear"
desc = "A pair of jeans paired with a khaki workshirt. A common pairing among blue-collar workers due to its drab look."
icon_state = "workwear_khaki"
worn_state = "workwear_khaki"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/workwear/pink
name = "pink workwear"
desc = "A pair of jeans paired with a pink workshirt. Pink? Your wife might not think so, but such outlandish attire deserves questioning by corporate security. What are you, some kind of free-thinking anarchist?"
icon_state = "workwear_pink"
worn_state = "workwear_pink"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/workwear/blue
name = "blue workwear"
desc = "A pair of brown canvas workpants paired with a dark blue workshirt. A common pairing among blue-collar workers."
icon_state = "workwear_blue"
worn_state = "workwear_blue"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/workwear/green
name = "green workwear"
desc = "A pair of brown canvas workpants paired with a green workshirt. An common pairing among blue-collar workers."
icon_state = "workwear_green"
worn_state = "workwear_green"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/colonist/clf
name = "\improper Colonial Liberation Front uniform"
desc = "A stylish grey-green jumpsuit - standard issue for colonists. This version appears to have the symbol of the Colonial Liberation Front emblazoned in select areas."
Expand Down Expand Up @@ -735,6 +769,7 @@
displays_id = FALSE
has_sensor = UNIFORM_HAS_SENSORS
sensor_faction = FACTION_MARINE

/obj/item/clothing/under/tshirt/gray_blu
name = "gray T-shirt and jeans"
desc = "A comfortable gray T-shirt and blue jeans."
Expand All @@ -755,7 +790,7 @@

/obj/item/clothing/under/CM_uniform
name = "\improper Colonial Marshal uniform"
desc = "A blue shirt and tan trousers - the official uniform for a Colonial Marshal."
desc = "A pair of off-white slacks and a blue button-down shirt with a dark brown tie; the standard uniform of the Colonial Marshals."
icon_state = "marshal"
worn_state = "marshal"
armor_melee = CLOTHING_ARMOR_LOW
Expand All @@ -766,7 +801,7 @@
armor_bio = CLOTHING_ARMOR_NONE
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_LOW

flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/liaison_suit
name = "liaison's tan suit"
Expand Down
7 changes: 5 additions & 2 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -972,8 +972,11 @@
icon_state = null
item_state = null
min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
//DON'T GRAB STUFF BETWEEN THIS LINE
//AND THIS LINE

item_icons = list(
WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
)

//END UNIFORM TEMPLATE

/obj/item/clothing/under/marine/fluff/marinemedic //UNUSED
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar, WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, WEAR_J_STORE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/worker_overalls(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES)
..()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK)
..()

Expand Down
Binary file modified icons/mob/humans/onmob/hands.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_1.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/uniform_0.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/gloves.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/uniforms.dmi
Binary file not shown.

0 comments on commit 64d528e

Please sign in to comment.