From 85e5731713b8de061010c71c31a6f13d40b2ec4c Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 30 Jan 2018 13:14:39 +0200 Subject: [PATCH 1/2] Adds dufflebags to loadout. -Adds dufflebags to loadout, including normal, black(cosmetic), and department specific versions with appropriate access restrictions to utility category. -Adds a cosmetic black duffle without the syndie speed buff. -Moves taur saddlebags from accessories category to utility category. Just a little preference QoL thing when you don't feel like scavenging and littering the station with discarded starter bags. --- .../items/weapons/storage/backpack_vr.dm | 7 ++- .../loadout/loadout_accessories_vr.dm | 20 ------- .../loadout/loadout_utility_vr.dm | 57 +++++++++++++++++++ vorestation.dme | 1 + 4 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 code/modules/client/preference_setup/loadout/loadout_utility_vr.dm diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index a3b76441527..9615cc81838 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -116,4 +116,9 @@ icon_state = "taurvest" icon_base = "taurvest" max_storage_space = INVENTORY_STANDARD_SPACE - slowdown = 0 \ No newline at end of file + slowdown = 0 + +/obj/item/weapon/storage/backpack/dufflebag/fluff //Black dufflebag without syndie buffs. + name = "plain black dufflebag" + desc = "A large dufflebag for holding extra tactical supplies." + icon_state = "duffle_syndie" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 642201d23e2..7f2aa68fe56 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -35,26 +35,6 @@ /datum/gear/accessory/white_vest allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist") -/datum/gear/accessory/saddlebag - display_name = "Saddle Bag, Horse" - path = /obj/item/weapon/storage/backpack/saddlebag - slot = slot_back - -/datum/gear/accessory/saddlebag_common - display_name = "Saddle Bag, Common" - path = /obj/item/weapon/storage/backpack/saddlebag_common - slot = slot_back - -/datum/gear/accessory/saddlebag_common/robust - display_name = "Saddle Bag, Robust" - path = /obj/item/weapon/storage/backpack/saddlebag_common/robust - slot = slot_back - -/datum/gear/accessory/saddlebag_common/vest - display_name = "Taur Duty Vest (backpack)" - path = /obj/item/weapon/storage/backpack/saddlebag_common/vest - slot = slot_back - /datum/gear/accessory/khcrystal display_name = "KH Life Crystal" path = /obj/item/weapon/storage/box/khcrystal diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm new file mode 100644 index 00000000000..cb0cf37639b --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -0,0 +1,57 @@ +/datum/gear/utility/saddlebag + display_name = "Saddle Bag, Horse" + path = /obj/item/weapon/storage/backpack/saddlebag + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common + display_name = "Saddle Bag, Common" + path = /obj/item/weapon/storage/backpack/saddlebag_common + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common/robust + display_name = "Saddle Bag, Robust" + path = /obj/item/weapon/storage/backpack/saddlebag_common/robust + slot = slot_back + cost = 2 + +/datum/gear/utility/saddlebag_common/vest + display_name = "Taur Duty Vest (backpack)" + path = /obj/item/weapon/storage/backpack/saddlebag_common/vest + slot = slot_back + cost = 1 + +/datum/gear/utility/dufflebag + display_name = "Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag + slot = slot_back + cost = 2 + +/datum/gear/utility/dufflebag/black + display_name = "Black Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/fluff + +/datum/gear/utility/dufflebag/med + display_name = "Medical Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/med + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + +/datum/gear/utility/dufflebag/med/emt + display_name = "EMT Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/emt + +/datum/gear/utility/dufflebag/sec + display_name = "Security Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/sec + allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + +/datum/gear/utility/dufflebag/eng + display_name = "Engineering Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/eng + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + +/datum/gear/utility/dufflebag/sci + display_name = "Science Dufflebag" + path = /obj/item/weapon/storage/backpack/dufflebag/sci + allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index ac98718777d..9b776148bfe 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1429,6 +1429,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_utility.dm" +#include "code\modules\client\preference_setup\loadout\loadout_utility_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno.dm" #include "code\modules\client\preference_setup\loadout\loadout_xeno_vr.dm" #include "code\modules\client\preference_setup\occupation\occupation.dm" From f3dc6add6ca940340d645b2cf28f014eebd80c0d Mon Sep 17 00:00:00 2001 From: Verkister Date: Tue, 30 Jan 2018 23:19:35 +0200 Subject: [PATCH 2/2] Update loadout_utility_vr.dm --- .../client/preference_setup/loadout/loadout_utility_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index cb0cf37639b..3812e907460 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -35,7 +35,7 @@ /datum/gear/utility/dufflebag/med display_name = "Medical Dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Search and Rescue") /datum/gear/utility/dufflebag/med/emt display_name = "EMT Dufflebag" @@ -44,14 +44,14 @@ /datum/gear/utility/dufflebag/sec display_name = "Security Dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sec - allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") + allowed_roles = list("Head of Security","Warden","Detective","Security Officer") /datum/gear/utility/dufflebag/eng display_name = "Engineering Dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") /datum/gear/utility/dufflebag/sci display_name = "Science Dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/sci - allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") \ No newline at end of file + allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer")