diff --git a/code/modules/clothing/under/solgov.dm b/code/modules/clothing/under/solgov.dm index 5f5cdb52f0..39109c480a 100644 --- a/code/modules/clothing/under/solgov.dm +++ b/code/modules/clothing/under/solgov.dm @@ -36,6 +36,7 @@ desc = "A comfortable turtleneck and black utility trousers." icon_state = "blackutility" worn_state = "blackutility" + rolled_sleeves = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 diff --git a/html/changelogs/Woodrat-Clothingtweaks.yml b/html/changelogs/Woodrat-Clothingtweaks.yml new file mode 100644 index 0000000000..a9c04f7410 --- /dev/null +++ b/html/changelogs/Woodrat-Clothingtweaks.yml @@ -0,0 +1,11 @@ + +# Your name. +author: Woodrat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +changes: + - rscadd: "Shaft Miner, Search & Rescue, Explorer can now select webbing vests and pouches from the loadout." + - bugfix: "Allow utility uniforms to roll up their sleeves." \ No newline at end of file diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm new file mode 100644 index 0000000000..31e900f89b --- /dev/null +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -0,0 +1,29 @@ +/datum/gear/accessory/brown_vest + display_name = "webbing, brown" + path = /obj/item/clothing/accessory/storage/brown_vest + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + +/datum/gear/accessory/black_vest + display_name = "webbing, black" + path = /obj/item/clothing/accessory/storage/black_vest + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + +/datum/gear/accessory/white_vest + display_name = "webbing, white" + path = /obj/item/clothing/accessory/storage/white_vest + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + +/datum/gear/accessory/brown_drop_pouches + display_name = "drop pouches, brown" + path = /obj/item/clothing/accessory/storage/brown_drop_pouches + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + +/datum/gear/accessory/black_drop_pouches + display_name = "drop pouches, black" + path = /obj/item/clothing/accessory/storage/black_drop_pouches + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + +/datum/gear/accessory/white_drop_pouches + display_name = "drop pouches, white" + path = /obj/item/clothing/accessory/storage/white_drop_pouches + allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") diff --git a/maps/southern_cross/southern_cross.dm b/maps/southern_cross/southern_cross.dm index 21002d36c5..c2b8acaadd 100644 --- a/maps/southern_cross/southern_cross.dm +++ b/maps/southern_cross/southern_cross.dm @@ -15,6 +15,7 @@ #include "shuttles/ninja.dm" #include "shuttles/ert.dm" + #include "loadout/loadout_accessories.dm" #include "loadout/loadout_head.dm" #include "loadout/loadout_suit.dm" #include "loadout/loadout_uniform.dm"