diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index 64ae1fcc5bb..045c682adef 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -261,3 +261,7 @@ /datum/dog_fashion/head/roman name = "Imperator REAL_NAME" desc = "For the Senate and the people of Rome!" + +/datum/dog_fashion/head/qm + name = "Supplymaster REAL_NAME" + desc = "A loyal watchdog for the most secure transportation." diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 77f96ba2229..3f23637747c 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -37,8 +37,9 @@ name = "Quartermaster" jobtype = /datum/job/qm - uniform = /obj/item/clothing/under/rank/cargo/quartermaster + uniform = /obj/item/clothing/under/rank/cargo/qm shoes = /obj/item/clothing/shoes/workboots/mining + head = /obj/item/clothing/head/qm l_ear = /obj/item/radio/headset/heads/qm glasses = /obj/item/clothing/glasses/sunglasses mask = /obj/item/clothing/mask/cigarette/cigar/cohiba diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index a82987c1214..c9e0ba2fb69 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -196,16 +196,18 @@ desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster." /obj/item/storage/bag/garment/quartermaster/populate_contents() - new /obj/item/clothing/under/rank/cargo/quartermaster(src) - new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src) + new /obj/item/clothing/under/rank/cargo/qm(src) + new /obj/item/clothing/under/rank/cargo/qm/skirt(src) + new /obj/item/clothing/under/rank/cargo/qm/dress(src) + new /obj/item/clothing/under/rank/cargo/qm/formal(src) + new /obj/item/clothing/under/rank/cargo/qm/whimsy(src) new /obj/item/clothing/shoes/brown(src) - new /obj/item/clothing/suit/hooded/wintercoat/cargo(src) - new /obj/item/clothing/suit/hooded/wintercoat/miner(src) - new /obj/item/clothing/suit/jacket/cargobomber(src) - new /obj/item/clothing/suit/jacket/miningbomber(src) + new /obj/item/clothing/head/qm(src) + new /obj/item/clothing/head/qm/beret(src) new /obj/item/clothing/head/hardhat/orange(src) + new /obj/item/clothing/suit/qmcoat(src) + new /obj/item/clothing/suit/mantle/qm(src) new /obj/item/clothing/suit/storage/hazardvest(src) - new /obj/item/clothing/head/soft(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/tank/internals/emergency_oxygen/double(src) diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 199fc48f33e..db3cd2447a6 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1087,7 +1087,7 @@ clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY) has_gloves = TRUE if(prob(1)) - clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "poncho"), ICON_OVERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "qmcoat"), ICON_OVERLAY) switch(backbag) if(2) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index e01eb105bda..c67f34595a5 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -197,6 +197,11 @@ path = /obj/item/clothing/head/hop/beret allowed_roles = list("Head of Personnel") +/datum/gear/hat/beret_job/qm + display_name = "Beret, quartermaster" + path = /obj/item/clothing/head/qm/beret + allowed_roles = list("Quartermaster") + /datum/gear/hat/beret_job/sci display_name = "Beret, science" path = /obj/item/clothing/head/beret/sci diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 60c1aaf5d63..9cb82ab6895 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -184,8 +184,8 @@ allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/uniform/skirt/job/qm - display_name = "Skirt, QM" - path = /obj/item/clothing/under/rank/cargo/quartermaster/skirt + display_name = "Skirt, quartermaster" + path = /obj/item/clothing/under/rank/cargo/qm/skirt allowed_roles = list("Quartermaster") /datum/gear/uniform/skirt/job/warden diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 05035de0446..17eafc5d44b 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/code/modules/clothing/head/job_hats.dm @@ -72,6 +72,28 @@ "Drask" = 'icons/mob/clothing/species/drask/head.dmi', ) +//Quartermaster +/obj/item/clothing/head/qm + name = "quartermaster's cap" + desc = "A cap issued to quartermasters. To show the warehouse workers who's boss." + icon_state = "qmcap" + dog_fashion = /datum/dog_fashion/head/qm + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' + ) + +/obj/item/clothing/head/qm/beret + name = "quartermaster's beret" + desc = "A brown beret with a golden cargo insignia emblazoned on it. Rule over Cargonia in style." + icon_state = "beret_qm" + dog_fashion = /datum/dog_fashion/head/qm + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi' + ) + //Nanotrasen Representative /obj/item/clothing/head/ntrep name = "Nanotrasen Representative's hat" diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index db2fcc1981d..710a654d5cd 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -280,6 +280,29 @@ "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi' ) +//Quartermaster +/obj/item/clothing/suit/mantle/qm + name = "quartermaster's mantle" + desc = "An armored shawl for the quartermaster. Keeps the breeze from the vents away from your neck." + icon_state = "qmmantle" + item_state = "qmmantle" + allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs) + armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) + +/obj/item/clothing/suit/qmcoat + name = "quartermaster's coat" + desc = "A brown trenchcoat to show the station you mean business. Has armor woven within the fabric." + icon_state = "qmcoat" + item_state = "qmcoat" + allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs) + armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50) + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/suit.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suit.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi' + ) + //Dignitaries /obj/item/clothing/suit/storage/ntrep name = "\improper Nanotrasen Representative jacket" diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 321a5c22637..95830f86952 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -5,17 +5,46 @@ "Human" = 'icons/mob/clothing/under/cargo.dmi', "Vox" = 'icons/mob/clothing/species/vox/under/cargo.dmi', "Drask" = 'icons/mob/clothing/species/drask/under/cargo.dmi', - "Grey" = 'icons/mob/clothing/species/grey/under/cargo.dmi' + "Grey" = 'icons/mob/clothing/species/grey/under/cargo.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/under/cargo.dmi' ) -/obj/item/clothing/under/rank/cargo/quartermaster +/obj/item/clothing/under/rank/cargo/qm name = "quartermaster's jumpsuit" desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." icon_state = "qm" - item_state = "lb_suit" + item_state = "qm" item_color = "qm" +/obj/item/clothing/under/rank/cargo/qm/skirt + name = "quartermaster's jumpskirt" + desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." + icon_state = "qm_skirt" + item_state = "qm_skirt" + item_color = "qm_skirt" + +/obj/item/clothing/under/rank/cargo/qm/dress + name = "quartermaster's dress uniform" + desc = "An elegant dress for the style conscious quartermaster." + icon_state = "qm_dress" + item_state = "qm_dress" + item_color = "qm_dress" + +/obj/item/clothing/under/rank/cargo/qm/formal + name = "quartermaster's formal uniform" + desc = "A pinstripe suit historically worn by schemers. Perfect for the quartermaster!" + icon_state = "qm_formal" + item_state = "qm_formal" + item_color = "qm_formal" + +/obj/item/clothing/under/rank/cargo/qm/whimsy + name = "quartermaster's sweater" + desc = "A snazzy brown sweater vest and black tie. Warms the core in the cold warehouse." + icon_state = "qm_whimsy" + 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." @@ -23,13 +52,6 @@ item_state = "lb_suit" item_color = "delivery" -/obj/item/clothing/under/rank/cargo/quartermaster/skirt - name = "quartermaster's jumpskirt" - desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper." - icon_state = "qmf" - item_color = "qmf" - body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS - /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" desc = "Shooooorts! They're comfy and easy to wear!" diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e682e29d83b..adc3610a837 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 88cd655b063..4304dbd35b9 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 2d60544fe02..1c32c32e0e1 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/under/cargo.dmi b/icons/mob/clothing/species/drask/under/cargo.dmi index 5418aaca38f..382e2d6e825 100644 Binary files a/icons/mob/clothing/species/drask/under/cargo.dmi and b/icons/mob/clothing/species/drask/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 83416f9d242..80769fa5600 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 25f80cacbb9..c9ab81aab83 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/under/cargo.dmi b/icons/mob/clothing/species/grey/under/cargo.dmi index affe121626a..4ed5cc61bd4 100644 Binary files a/icons/mob/clothing/species/grey/under/cargo.dmi and b/icons/mob/clothing/species/grey/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index d773c94c128..e63c4014d0d 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/cargo.dmi b/icons/mob/clothing/species/kidan/under/cargo.dmi new file mode 100644 index 00000000000..5aea23d076a Binary files /dev/null and b/icons/mob/clothing/species/kidan/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 41f2af617a7..bec31649e61 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index e713793e1a7..501021282a9 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/under/cargo.dmi b/icons/mob/clothing/species/vox/under/cargo.dmi index bbe39935b0e..8771279567b 100644 Binary files a/icons/mob/clothing/species/vox/under/cargo.dmi and b/icons/mob/clothing/species/vox/under/cargo.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index dc17eb619e1..ee47448f320 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index ebf8820bb35..6fcc309e9c4 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 0b8ecbb12ea..879ecfcac52 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1818a6d857b..2f7d44c6664 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index db1ca801771..548378435f3 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index a02af29d10b..0a2f2040688 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ