cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cargo Technician resprite + some hazard vests (#25399)

Browse Source 
* cargotech and hazard vests

* deliveryboy and bomberjacket

* explorer merge changes
This commit is contained in:
Christasmurf
2024-05-29 14:40:08 +01:00
committed by GitHub
parent 97d43770f5
commit 0db4c22804
47 changed files with 116 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_hat.dm
+5 -5
View File
@@ -77,11 +77,6 @@
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/hat/deliverysoft
display_name = "Cap, delivery boy"
path = /obj/item/clothing/head/soft/deliverysoft
allowed_roles = list("Quartermaster", "Cargo Technician")
/datum/gear/hat/capjanigrey
display_name = "Cap, janitor grey"
path = /obj/item/clothing/head/soft/janitorgrey
@@ -202,6 +197,11 @@
path = /obj/item/clothing/head/beret/hop
allowed_roles = list("Head of Personnel")
/datum/gear/hat/beret_job/cargo
display_name = "Beret, cargo"
path = /obj/item/clothing/head/beret/cargo
allowed_roles = list("Quartermaster", "Cargo Technician")
/datum/gear/hat/beret_job/qm
display_name = "Beret, quartermaster"
path = /obj/item/clothing/head/beret/qm
code/modules/client/preference/loadout/loadout_uniform.dm
+2 -2
View File
@@ -261,8 +261,8 @@
main_typepath = /datum/gear/uniform/cargo
/datum/gear/uniform/cargo/delivery
display_name = "Uniform, delivery boy"
path = /obj/item/clothing/under/rank/cargo/deliveryboy
display_name = "Cargo uniform, delivery"
path = /obj/item/clothing/under/rank/cargo/tech/delivery
allowed_roles = list("Quartermaster", "Cargo Technician")
/datum/gear/uniform/sec
code/modules/clothing/head/beret.dm
+9
View File
@@ -156,6 +156,15 @@
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
/obj/item/clothing/head/beret/cargo
name = "cargo beret"
desc = "A brown beret with a grey cargo insignia emblazoned on it. Haul crates with style."
icon_state = "beret_cargo"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi'
)
/obj/item/clothing/head/beret/expedition
name = "expedition beret"
desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same."
code/modules/clothing/head/soft_caps.dm
+1 -16
View File
@@ -100,32 +100,17 @@
/obj/item/clothing/head/soft/cargo
name = "cargo cap"
desc = "It's a baseball hat in a tasteless yellow colour."
desc = "It's a brown baseball hat with a grey cargo technician shield."
icon_state = "cargosoft"
item_color = "cargo"
dog_fashion = /datum/dog_fashion/head/cargo_tech
/obj/item/clothing/head/soft/deliverysoft
name = "delivery boy cap"
desc = "It's a baseball hat that is part of the delivery boy uniform."
icon_state = "deliverysoft"
item_color = "delivery"
dog_fashion = /datum/dog_fashion/head/softcap
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head/softcap.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi'
)
/obj/item/clothing/head/soft/expedition
name = "expedition cap"
desc = "It's a baseball hat in the brown and blue markings of the expedition team."
icon_state = "expeditionsoft"
item_color = "expedition"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi'
)
/obj/item/clothing/head/soft/janitorgrey
name = "grey janitor's cap"
code/modules/clothing/suits/job_suits.dm
+28 -5
View File
@@ -194,20 +194,43 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
)
//Engineering
//Hazard vests
/obj/item/clothing/suit/storage/hazardvest
name = "hazard vest"
desc = "A high-visibility vest used in work zones."
icon_state = "hazard"
item_state = "hazard"
desc = "A high-visibility vest used in work zones. Designed for general use."
icon = 'icons/obj/clothing/suits/utility.dmi'
icon_state = "hazard_base"
item_state = 'icons/mob/clothing/suits/utility.dmi'
icon_override = 'icons/mob/clothing/suits/utility.dmi'
blood_overlay_type = "armor"
allowed = list (/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/rcd, /obj/item/rpd)
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi'
)
/obj/item/clothing/suit/storage/hazardvest/staff
name = "staff hazard vest"
desc = "A high-visibilty vest used in work zones. Designed to easily identify station staff from visitors."
icon_state = "hazard_staff"
allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/rcs, /obj/item/destTagger)
/obj/item/clothing/suit/storage/hazardvest/qm
name = "warehouse supervisor hazard vest"
desc = "A high-visibilty vest used in work zones. Designed to easily identify the supply supervisor."
icon_state = "hazard_qm"
allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcs, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster)
/obj/item/clothing/suit/storage/hazardvest/ce
name = "foreman hazard vest"
desc = "A high-visibility vest used in work zones. Designed to easily identify the engineering supervisor."
icon_state = "hazard_ce"
allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
//Internal Affairs
/obj/item/clothing/suit/storage/iaa
desc = "A snappy dress jacket."
code/modules/clothing/under/accessories/armband.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/clothing/accessory/armband/cargo
name = "cargo armband"
desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown."
desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown with a black strip."
icon_state = "cargo"
item_color = "cargo"
code/modules/clothing/under/jobs/cargo.dm
+21 -13
View File
@@ -45,25 +45,33 @@
item_state = "qm_whimsy"
item_color = "qm_whimsy"
/obj/item/clothing/under/rank/cargo/deliveryboy
name = "delivery boy uniform"
desc = "It's a jumpsuit worn by the cargo delivery boy."
icon_state = "delivery"
item_state = "lb_suit"
item_color = "delivery"
/obj/item/clothing/under/rank/cargo/tech
name = "cargo technician's jumpsuit"
desc = "Shooooorts! They're comfy and easy to wear!"
icon_state = "cargotech"
item_state = "lb_suit"
desc = "A standard issue jumpsuit for cargo technicians. Snazzy!"
icon_state = "cargo"
item_state = "cargo"
item_color = "cargo"
/obj/item/clothing/under/rank/cargo/tech/skirt
name = "cargo technician's jumpskirt"
desc = "Skirrrrrts! They're comfy and easy to wear!"
icon_state = "cargof"
item_color = "cargof"
desc = "A standard issue jumpskirt for cargo technicians. Jazzy!"
icon_state = "cargo_skirt"
item_state = "cargo_skirt"
item_color = "cargo_skirt"
/obj/item/clothing/under/rank/cargo/tech/overalls
name = "cargo technician's overalls"
desc = "Protective overalls to keep spills from the warehouse off your legs."
icon_state = "cargo_overalls"
item_state = "cargo_overalls"
item_color = "cargo_overalls"
/obj/item/clothing/under/rank/cargo/tech/delivery
name = "delivery uniform"
desc = "It's a jumpsuit worn by the cargo delivery crew."
icon_state = "delivery"
item_state = "delivery"
item_color = "delivery"
/obj/item/clothing/under/rank/cargo/miner
name = "shaft miner's jumpsuit"
code/modules/supply/supply_packs/pack_engineering.dm
+3 -3
View File
@@ -61,9 +61,9 @@
contains = list(/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/suit/storage/hazardvest/staff,
/obj/item/clothing/suit/storage/hazardvest/staff,
/obj/item/clothing/suit/storage/hazardvest/staff,
/obj/item/clothing/head/welding,
/obj/item/clothing/head/welding,
/obj/item/clothing/head/welding,