From d1ae0749ccbbc0e2770a4459fe9cc7567fd2d845 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Fri, 17 Feb 2017 11:45:39 -0800 Subject: [PATCH] Who even knew department duffelbags were a thing? --- code/game/jobs/job/engineering.dm | 5 +++++ code/game/jobs/job/job.dm | 3 +++ code/game/jobs/job/medical.dm | 7 +++++++ code/game/jobs/job/science.dm | 2 ++ code/game/jobs/job/security.dm | 5 +++++ code/game/jobs/job/supervisor.dm | 1 + code/game/jobs/job/support.dm | 2 ++ 7 files changed, 25 insertions(+) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index f53a0936c00..1cdff2ec775 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -39,6 +39,7 @@ backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel_eng + dufflebag = /obj/item/weapon/storage/backpack/duffel/engineering box = /obj/item/weapon/storage/box/engineer @@ -69,8 +70,10 @@ id = /obj/item/weapon/card/id/engineering l_pocket = /obj/item/device/t_scanner pda = /obj/item/device/pda/engineering + backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel_eng + dufflebag = /obj/item/weapon/storage/backpack/duffel/engineering box = /obj/item/weapon/storage/box/engineer @@ -100,6 +103,7 @@ l_ear = /obj/item/device/radio/headset/headset_eng id = /obj/item/weapon/card/id/engineering pda = /obj/item/device/pda/atmos + box = /obj/item/weapon/storage/box/engineer /datum/job/mechanic @@ -133,4 +137,5 @@ backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel_eng + dufflebag = /obj/item/weapon/storage/backpack/duffel/engineering box = /obj/item/weapon/storage/box/engineer diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index b0c75cb1c99..56e41ad2d82 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -129,6 +129,7 @@ var/backpack = /obj/item/weapon/storage/backpack var/satchel = /obj/item/weapon/storage/backpack/satchel_norm + var/dufflebag = /obj/item/weapon/storage/backpack/duffel var/box = /obj/item/weapon/storage/box/survival var/tmp/list/gear_leftovers = list() @@ -145,6 +146,8 @@ back = /obj/item/weapon/storage/backpack/satchel //Leather Satchel if(DSATCHEL) back = satchel //Department satchel + if(DDUFFLEBAG) + back = dufflebag //Department dufflebag else back = backpack //Department backpack diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 060455b4ead..3c6d6f7fe01 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -37,6 +37,7 @@ backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel_med + dufflebag = /obj/item/weapon/storage/backpack/duffel/medical /datum/job/doctor title = "Medical Doctor" @@ -68,6 +69,7 @@ backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel_med + dufflebag = /obj/item/weapon/storage/backpack/duffel/medical /datum/outfit/job/doctor/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() @@ -129,6 +131,7 @@ backpack = /obj/item/weapon/storage/backpack/chemistry satchel = /obj/item/weapon/storage/backpack/satchel_chem + dufflebag = /obj/item/weapon/storage/backpack/duffel/chemistry /datum/job/geneticist title = "Geneticist" @@ -158,6 +161,7 @@ backpack = /obj/item/weapon/storage/backpack/genetics satchel = /obj/item/weapon/storage/backpack/satchel_gen + dufflebag = /obj/item/weapon/storage/backpack/duffel/genetics /datum/job/virologist @@ -187,8 +191,10 @@ id = /obj/item/weapon/card/id/medical suit_store = /obj/item/device/flashlight/pen pda = /obj/item/device/pda/viro + backpack = /obj/item/weapon/storage/backpack/virology satchel = /obj/item/weapon/storage/backpack/satchel_vir + dufflebag = /obj/item/weapon/storage/backpack/duffel/virology /datum/job/psychiatrist title = "Psychiatrist" @@ -259,5 +265,6 @@ backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel_med + dufflebag = /obj/item/weapon/storage/backpack/duffel/medical box = /obj/item/weapon/storage/box/engineer diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 4e7e5e39683..2701589b2db 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -44,6 +44,7 @@ backpack = /obj/item/weapon/storage/backpack/science satchel = /obj/item/weapon/storage/backpack/satchel_tox + dufflebag = /obj/item/weapon/storage/backpack/duffel/science /datum/job/scientist @@ -80,6 +81,7 @@ backpack = /obj/item/weapon/storage/backpack/science satchel = /obj/item/weapon/storage/backpack/satchel_tox + dufflebag = /obj/item/weapon/storage/backpack/duffel/science /datum/job/roboticist diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 431e67eede8..62b248c4875 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -44,6 +44,7 @@ backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel_sec + dufflebag = /obj/item/weapon/storage/backpack/duffel/security @@ -86,6 +87,7 @@ backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel_sec + dufflebag = /obj/item/weapon/storage/backpack/duffel/security @@ -185,6 +187,7 @@ backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel_sec + dufflebag = /obj/item/weapon/storage/backpack/duffel/security @@ -219,6 +222,7 @@ backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel_med + dufflebag = /obj/item/weapon/storage/backpack/duffel/medical @@ -257,4 +261,5 @@ backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel_sec + dufflebag = /obj/item/weapon/storage/backpack/duffel/security box = /obj/item/weapon/storage/box/engineer \ No newline at end of file diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index a3e281095a1..15b98df30ad 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -45,6 +45,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) backpack = /obj/item/weapon/storage/backpack/captain satchel = /obj/item/weapon/storage/backpack/satchel_cap + dufflebag = /obj/item/weapon/storage/backpack/duffel/captain /datum/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H && H.w_uniform) diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index bf4227adc6d..b7487476e1e 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -93,6 +93,7 @@ backpack = /obj/item/weapon/storage/backpack/botany satchel = /obj/item/weapon/storage/backpack/satchel_hyd + dufflebag = /obj/item/weapon/storage/backpack/duffel/hydro @@ -221,6 +222,7 @@ backpack = /obj/item/weapon/storage/backpack/clown satchel = /obj/item/weapon/storage/backpack/clown + dufflebag = /obj/item/weapon/storage/backpack/duffel/clown /datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..()