From f2d829261a5de7a0a9fea225f3b108548cf4e7ff Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 8 Jun 2017 15:16:20 -0700 Subject: [PATCH] [Typo] Duffel Bag (#28200) --- .../LavaRuins/lavaland_biodome_beach.dmm | 2 +- .../lavaland_surface_animal_hospital.dmm | 2 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 2 +- _maps/RandomZLevels/snowdin.dmm | 2 +- .../map_files/Deltastation/DeltaStation2.dmm | 7 +- _maps/map_files/MetaStation/MetaStation.dmm | 19 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 5 +- _maps/shuttles/whiteship_meta.dmm | 5 +- code/_globalvars/lists/flavor_misc.dm | 6 +- .../items/stacks/sheets/sheet_types.dm | 2 +- .../objects/items/weapons/storage/backpack.dm | 211 +++++++++++------- .../crates_lockers/closets/job_closets.dm | 10 +- .../crates_lockers/closets/secure/medical.dm | 2 +- .../crates_lockers/closets/secure/personal.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 2 +- .../crates_lockers/closets/syndicate.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 2 +- code/modules/cargo/packs.dm | 2 +- code/modules/jobs/job_types/captain.dm | 2 +- code/modules/jobs/job_types/cargo_service.dm | 2 +- code/modules/jobs/job_types/civilian.dm | 2 +- code/modules/jobs/job_types/engineering.dm | 6 +- code/modules/jobs/job_types/job.dm | 10 +- code/modules/jobs/job_types/medical.dm | 10 +- code/modules/jobs/job_types/security.dm | 6 +- code/modules/mining/machine_vending.dm | 6 +- code/modules/mining/mine_items.dm | 2 +- .../simple_animal/friendly/drone/_drone.dm | 2 +- code/modules/uplink/uplink_item.dm | 32 +-- icons/obj/storage.dmi | Bin 58920 -> 58920 bytes 30 files changed, 194 insertions(+), 171 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 1a4f7aacbbb..35960074c1c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -562,7 +562,7 @@ /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bK" = ( -/obj/item/weapon/storage/backpack/dufflebag, +/obj/item/weapon/storage/backpack/duffelbag, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bL" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index 127d5b3d55e..288f5fd12c6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -377,7 +377,7 @@ "ba" = ( /obj/structure/table/glass, /obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/storage/backpack/dufflebag/med, +/obj/item/weapon/storage/backpack/duffelbag/med, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface }, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 43258deaf81..3fbffc4ffa4 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -213,7 +213,7 @@ "ee" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) "ef" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) "eg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) -"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "dufflebag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) +"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) "ei" = (/obj/structure/dresser,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) "ej" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) "ek" = (/obj/structure/bed,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/bedsheet,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index bac50dd89ac..f6b56c5c044 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -4740,7 +4740,7 @@ /area/awaymission/snowdin/sekret) "mx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg, +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 88116a4801c..406b634d90c 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -19702,10 +19702,7 @@ /obj/item/weapon/reagent_containers/glass/bottle/facid{ pixel_x = 7 }, -/obj/item/weapon/storage/backpack/dufflebag/sec{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); - desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; - name = "dufflebag"; +/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /turf/open/floor/plasteel/darkred/side{ @@ -90562,7 +90559,7 @@ "dzi" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/backpack/dufflebag/med, +/obj/item/weapon/storage/backpack/duffelbag/med, /obj/item/device/flashlight/pen, /turf/open/floor/plating, /area/medical/morgue) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index bdc909211b9..80e7c19c3bc 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1847,10 +1847,7 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/sec{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); - desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; - name = "dufflebag"; +/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /obj/item/clothing/mask/balaclava, @@ -15125,12 +15122,7 @@ /obj/item/weapon/storage/secure/briefcase{ contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/ballistic/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen) }, -/obj/item/weapon/storage/backpack/dufflebag{ - contents = newlist(/obj/item/clothing/under/lawyer/blacksuit,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/suit/toggle/lawyer/black,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); - desc = "A large dufflebag for holding extra things. There is a NanoTrasen logo on the back."; - icon_state = "duffle-syndieammo"; - item_state = "duffle-syndieammo" - }, +/obj/item/weapon/storage/backpack/duffelbag/syndie/hitman, /obj/item/weapon/card/id/silver{ access = list(12); assignment = "Reaper"; @@ -73617,7 +73609,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/storage/backpack/dufflebag/med, +/obj/item/weapon/storage/backpack/duffelbag/med, /obj/item/device/flashlight/pen{ pixel_x = 4; pixel_y = 3 @@ -82851,10 +82843,7 @@ /area/shuttle/abandoned) "cYD" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/med{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgicaldrill,/obj/item/weapon/razor); - desc = "A large dufflebag for holding extra medical supplies - this one seems to be designed for holding surgical tools."; - name = "surgical dufflebag"; +/obj/item/weapon/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index aed8a826874..64f66a661d3 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2381,10 +2381,7 @@ pixel_y = 0 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/sec{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); - desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; - name = "dufflebag"; +/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /obj/item/clothing/mask/balaclava, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index c51b9cac8b7..c05e98c0afe 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1747,10 +1747,7 @@ /area/shuttle/abandoned) "db" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/med{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgicaldrill,/obj/item/weapon/razor); - desc = "A large dufflebag for holding extra medical supplies - this one seems to be designed for holding surgical tools."; - name = "surgical dufflebag"; +/obj/item/weapon/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, /turf/open/floor/mineral/titanium, diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 61e28a8fb47..3cfdba6cbf2 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -43,12 +43,12 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_ //Backpacks #define GBACKPACK "Grey Backpack" #define GSATCHEL "Grey Satchel" -#define GDUFFLEBAG "Grey Dufflebag" +#define GDUFFELBAG "Grey Duffel Bag" #define LSATCHEL "Leather Satchel" #define DBACKPACK "Department Backpack" #define DSATCHEL "Department Satchel" -#define DDUFFLEBAG "Department Dufflebag" -GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL)) +#define DDUFFELBAG "Department Duffel Bag" +GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL)) //Uplink spawn loc #define UPLINK_PDA "PDA" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 61abe978595..4dd2e17dfb5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \ null, \ new/datum/stack_recipe("backpack", /obj/item/weapon/storage/backpack, 4), \ - new/datum/stack_recipe("dufflebag", /obj/item/weapon/storage/backpack/dufflebag, 6), \ + new/datum/stack_recipe("duffel bag", /obj/item/weapon/storage/backpack/duffelbag, 6), \ null, \ new/datum/stack_recipe("plant bag", /obj/item/weapon/storage/bag/plants, 4), \ new/datum/stack_recipe("book bag", /obj/item/weapon/storage/bag/books, 4), \ diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 73d270f9bbb..600e5ff1d80 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -316,48 +316,77 @@ new R(src) revealed = 1 -/obj/item/weapon/storage/backpack/dufflebag - name = "dufflebag" - desc = "A large dufflebag for holding extra things." - icon_state = "duffle" - item_state = "duffle" +/obj/item/weapon/storage/backpack/duffelbag + name = "duffel bag" + desc = "A large duffel bag for holding extra things." + icon_state = "duffel" + item_state = "duffel" slowdown = 1 max_combined_w_class = 30 -/obj/item/weapon/storage/backpack/dufflebag/captain - name = "captain's dufflebag" - desc = "A large dufflebag for holding extra captainly goods." - icon_state = "duffle-captain" - item_state = "duffle-captain" +/obj/item/weapon/storage/backpack/duffelbag/captain + name = "captain's duffel bag" + desc = "A large duffel bag for holding extra captainly goods." + icon_state = "duffel-captain" + item_state = "duffel-captain" resistance_flags = 0 -/obj/item/weapon/storage/backpack/dufflebag/med - name = "medical dufflebag" - desc = "A large dufflebag for holding extra medical supplies." - icon_state = "duffle-med" - item_state = "duffle-med" +/obj/item/weapon/storage/backpack/duffelbag/med + name = "medical duffel bag" + desc = "A large duffel bag for holding extra medical supplies." + icon_state = "duffel-med" + item_state = "duffel-med" -/obj/item/weapon/storage/backpack/dufflebag/sec - name = "security dufflebag" - desc = "A large dufflebag for holding extra security supplies and ammunition." - icon_state = "duffle-sec" - item_state = "duffle-sec" +/obj/item/weapon/storage/backpack/duffelbag/med/surgery + name = "surgical duffel bag" + desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." -/obj/item/weapon/storage/backpack/dufflebag/engineering - name = "industrial dufflebag" - desc = "A large dufflebag for holding extra tools and supplies." - icon_state = "duffle-eng" - item_state = "duffle-eng" +/obj/item/weapon/storage/backpack/duffelbag/med/surgery/PopulateContents() + new /obj/item/weapon/scalpel(src) + new /obj/item/weapon/hemostat(src) + new /obj/item/weapon/retractor(src) + new /obj/item/weapon/circular_saw(src) + new /obj/item/weapon/surgicaldrill(src) + new /obj/item/weapon/cautery(src) + new /obj/item/weapon/surgical_drapes(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/weapon/razor(src) + +/obj/item/weapon/storage/backpack/duffelbag/sec + name = "security duffel bag" + desc = "A large duffel bag for holding extra security supplies and ammunition." + icon_state = "duffel-sec" + item_state = "duffel-sec" + +/obj/item/weapon/storage/backpack/duffelbag/sec/surgery + name = "surgical duffel bag" + desc = "A large duffel bag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools." + +/obj/item/weapon/storage/backpack/duffelbag/sec/surgery/PopulateContents() + new /obj/item/weapon/scalpel(src) + new /obj/item/weapon/hemostat(src) + new /obj/item/weapon/retractor(src) + new /obj/item/weapon/circular_saw(src) + new /obj/item/weapon/surgicaldrill(src) + new /obj/item/weapon/cautery(src) + new /obj/item/weapon/surgical_drapes(src) + new /obj/item/clothing/mask/surgical(src) + +/obj/item/weapon/storage/backpack/duffelbag/engineering + name = "industrial duffel bag" + desc = "A large duffel bag for holding extra tools and supplies." + icon_state = "duffel-eng" + item_state = "duffel-eng" resistance_flags = 0 -/obj/item/weapon/storage/backpack/dufflebag/drone - name = "drone dufflebag" - desc = "A large dufflebag for holding tools and hats." - icon_state = "duffle-drone" - item_state = "duffle-drone" +/obj/item/weapon/storage/backpack/duffelbag/drone + name = "drone duffel bag" + desc = "A large duffel bag for holding tools and hats." + icon_state = "duffel-drone" + item_state = "duffel-drone" resistance_flags = FIRE_PROOF -/obj/item/weapon/storage/backpack/dufflebag/drone/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/drone/PopulateContents() new /obj/item/weapon/screwdriver(src) new /obj/item/weapon/wrench(src) new /obj/item/weapon/weldingtool(src) @@ -366,38 +395,52 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/device/multitool(src) -/obj/item/weapon/storage/backpack/dufflebag/clown - name = "clown's dufflebag" - desc = "A large dufflebag for holding lots of funny gags!" - icon_state = "duffle-clown" - item_state = "duffle-clown" +/obj/item/weapon/storage/backpack/duffelbag/clown + name = "clown's duffel bag" + desc = "A large duffel bag for holding lots of funny gags!" + icon_state = "duffel-clown" + item_state = "duffel-clown" -/obj/item/weapon/storage/backpack/dufflebag/clown/cream_pie/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/clown/cream_pie/PopulateContents() for(var/i in 1 to 10) new /obj/item/weapon/reagent_containers/food/snacks/pie/cream(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie - name = "suspicious looking dufflebag" - desc = "A large dufflebag for holding extra tactical supplies." - icon_state = "duffle-syndie" - item_state = "duffle-syndie" +/obj/item/weapon/storage/backpack/duffelbag/syndie + name = "suspicious looking duffel bag" + desc = "A large duffel bag for holding extra tactical supplies." + icon_state = "duffel-syndie" + item_state = "duffel-syndie" origin_tech = "syndicate=1" silent = 1 slowdown = 0 -/obj/item/weapon/storage/backpack/dufflebag/syndie/med - name = "medical dufflebag" - desc = "A large dufflebag for holding extra tactical medical supplies." - icon_state = "duffle-syndiemed" - item_state = "duffle-syndiemed" +/obj/item/weapon/storage/backpack/duffelbag/syndie/hitman + desc = "A large duffel bag for holding extra things. There is a NanoTrasen logo on the back." + icon_state = "duffel-syndieammo" + item_state = "duffel-syndieammo" -/obj/item/weapon/storage/backpack/dufflebag/syndie/surgery - name = "surgery dufflebag" - desc = "A suspicious looking dufflebag for holding surgery tools." - icon_state = "duffle-syndiemed" - item_state = "duffle-syndiemed" +/obj/item/weapon/storage/backpack/duffelbag/syndie/hitman/PopulateContents() + new /obj/item/clothing/under/lawyer/blacksuit(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/suit/toggle/lawyer/black(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/clothing/gloves/color/black(src) + new /obj/item/clothing/glasses/sunglasses(src) + new /obj/item/clothing/head/fedora(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/surgery/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/med + name = "medical duffel bag" + desc = "A large duffel bag for holding extra tactical medical supplies." + icon_state = "duffel-syndiemed" + item_state = "duffel-syndiemed" + +/obj/item/weapon/storage/backpack/duffelbag/syndie/surgery + name = "surgery duffel bag" + desc = "A suspicious looking duffel bag for holding surgery tools." + icon_state = "duffel-syndiemed" + item_state = "duffel-syndiemed" + +/obj/item/weapon/storage/backpack/duffelbag/syndie/surgery/PopulateContents() new /obj/item/weapon/scalpel(src) new /obj/item/weapon/hemostat(src) new /obj/item/weapon/retractor(src) @@ -409,69 +452,69 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/device/mmi/syndie(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo - name = "ammunition dufflebag" - desc = "A large dufflebag for holding extra weapons ammunition and supplies." - icon_state = "duffle-syndieammo" - item_state = "duffle-syndieammo" +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo + name = "ammunition duffel bag" + desc = "A large duffel bag for holding extra weapons ammunition and supplies." + icon_state = "duffel-syndieammo" + item_state = "duffel-syndieammo" -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun - desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo." +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/shotgun + desc = "A large duffel bag, packed to the brim with Bulldog shotgun ammo." -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/shotgun/PopulateContents() for(var/i in 1 to 6) new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/ammo_box/magazine/m12g/buckshot(src) new /obj/item/ammo_box/magazine/m12g/slug(src) new /obj/item/ammo_box/magazine/m12g/dragon(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg - desc = "A large dufflebag, packed to the brim with C20r magazines." +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg + desc = "A large duffel bag, packed to the brim with C20r magazines." -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg/PopulateContents() for(var/i in 1 to 9) new /obj/item/ammo_box/magazine/smgm45(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle - desc = "A large dufflebag containing a C20r, some magazines, and a cheap looking suppressor." +/obj/item/weapon/storage/backpack/duffelbag/syndie/c20rbundle + desc = "A large duffel bag containing a C20r, some magazines, and a cheap looking suppressor." -/obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/c20rbundle/PopulateContents() new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/weapon/gun/ballistic/automatic/c20r(src) new /obj/item/weapon/suppressor/specialoffer(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle - desc = "A large dufflebag containing a Bulldog, several drums, and a collapsed hardsuit." +/obj/item/weapon/storage/backpack/duffelbag/syndie/bulldogbundle + desc = "A large duffel bag containing a Bulldog, several drums, and a collapsed hardsuit." -/obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/bulldogbundle/PopulateContents() new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog(src) new /obj/item/ammo_box/magazine/m12g/buckshot(src) new /obj/item/clothing/glasses/thermal/syndi(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle - desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/medicalbundle + desc = "A large duffel bag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) new /obj/item/weapon/storage/firstaid/tactical(src) new /obj/item/weapon/gun/ballistic/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle - desc = "A large dufflebag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/medicalbundle + desc = "A large duffel bag containing a medical equipment, a Donksoft machine gun, a big jumbo box of darts, and a knock-off pair of magboots." -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) new /obj/item/weapon/storage/firstaid/tactical(src) new /obj/item/weapon/gun/ballistic/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle - desc = "A large dufflebag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes" +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/bioterrorbundle + desc = "A large duffel bag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes" -/obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/med/bioterrorbundle/PopulateContents() new /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror(src) new /obj/item/weapon/storage/box/syndie_kit/chemical(src) new /obj/item/weapon/gun/syringe/syndicate(src) @@ -480,18 +523,18 @@ new /obj/item/ammo_box/foambox/riot(src) new /obj/item/weapon/grenade/chem_grenade/bioterrorfoam(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/c4/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/c4/PopulateContents() for(var/i in 1 to 10) new /obj/item/weapon/grenade/plastic/c4(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/x4/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/x4/PopulateContents() for(var/i in 1 to 3) new /obj/item/weapon/grenade/plastic/x4(src) -/obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter - desc = "A large dufflebag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment." +/obj/item/weapon/storage/backpack/duffelbag/syndie/firestarter + desc = "A large duffel bag containing New Russian pyro backpack sprayer, a pistol, a pipebomb, fireproof hardsuit, ammo, and other equipment." -/obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter/PopulateContents() +/obj/item/weapon/storage/backpack/duffelbag/syndie/firestarter/PopulateContents() new /obj/item/clothing/under/syndicate/soviet(src) new /obj/item/weapon/watertank/operator(src) new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 5c1b27b5b4b..f9598f52447 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -141,8 +141,8 @@ new /obj/item/clothing/suit/hooded/wintercoat/security(src) new /obj/item/weapon/storage/backpack/security(src) new /obj/item/weapon/storage/backpack/satchel/sec(src) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) - new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + new /obj/item/weapon/storage/backpack/duffelbag/sec(src) + new /obj/item/weapon/storage/backpack/duffelbag/sec(src) for(var/i in 1 to 3) new /obj/item/clothing/under/rank/security(src) for(var/i in 1 to 3) @@ -177,7 +177,7 @@ icon_door = "atmos_wardrobe" /obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents() - new /obj/item/weapon/storage/backpack/dufflebag/engineering(src) + new /obj/item/weapon/storage/backpack/duffelbag/engineering(src) new /obj/item/weapon/storage/backpack/satchel/eng(src) new /obj/item/weapon/storage/backpack/industrial(src) for(var/i in 1 to 3) @@ -193,7 +193,7 @@ icon_door = "yellow" /obj/structure/closet/wardrobe/engineering_yellow/PopulateContents() - new /obj/item/weapon/storage/backpack/dufflebag/engineering(src) + new /obj/item/weapon/storage/backpack/duffelbag/engineering(src) new /obj/item/weapon/storage/backpack/industrial(src) new /obj/item/weapon/storage/backpack/satchel/eng(src) new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) @@ -211,7 +211,7 @@ name = "medical doctor's wardrobe" /obj/structure/closet/wardrobe/white/medical/PopulateContents() - new /obj/item/weapon/storage/backpack/dufflebag/med(src) + new /obj/item/weapon/storage/backpack/duffelbag/med(src) new /obj/item/weapon/storage/backpack/medic(src) new /obj/item/weapon/storage/backpack/satchel/med(src) new /obj/item/clothing/suit/hooded/wintercoat/medical(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 3fb35b0dafd..71859f80203 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -55,7 +55,7 @@ /obj/structure/closet/secure_closet/CMO/PopulateContents() ..() new /obj/item/clothing/neck/cloak/cmo(src) - new /obj/item/weapon/storage/backpack/dufflebag/med(src) + new /obj/item/weapon/storage/backpack/duffelbag/med(src) new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/suit/toggle/labcoat/cmo(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index a35c18350c9..1be12952a29 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -7,7 +7,7 @@ /obj/structure/closet/secure_closet/personal/PopulateContents() ..() if(prob(50)) - new /obj/item/weapon/storage/backpack/dufflebag(src) + new /obj/item/weapon/storage/backpack/duffelbag(src) if(prob(50)) new /obj/item/weapon/storage/backpack(src) else diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index c045b763f1a..e2e506c00dc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -11,7 +11,7 @@ else new /obj/item/weapon/storage/backpack/satchel/cap(src) new /obj/item/clothing/neck/cloak/cap(src) - new /obj/item/weapon/storage/backpack/dufflebag/captain(src) + new /obj/item/weapon/storage/backpack/duffelbag/captain(src) new /obj/item/clothing/head/crown/fancy(src) new /obj/item/clothing/suit/captunic(src) new /obj/item/clothing/under/captainparade(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 030aa373eab..eec62d43414 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -25,7 +25,7 @@ new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/box/teargas(src) - new /obj/item/weapon/storage/backpack/dufflebag/syndie/med(src) + new /obj/item/weapon/storage/backpack/duffelbag/syndie/med(src) new /obj/item/device/pda/syndicate(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index a173a20dc0c..89ebec8e612 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -126,7 +126,7 @@ for(var/i in 1 to 3) new /obj/item/clothing/head/soft/grey(src) if(prob(50)) - new /obj/item/weapon/storage/backpack/dufflebag(src) + new /obj/item/weapon/storage/backpack/duffelbag(src) if(prob(40)) new /obj/item/clothing/mask/bandana/black(src) new /obj/item/clothing/mask/bandana/black(src) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 38bd719891f..8f106e2430c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -998,7 +998,7 @@ /datum/supply_pack/organic/cream_piee name = "High-yield Clown-grade Cream Pie Crate" cost = 6000 - contains = list(/obj/item/weapon/storage/backpack/dufflebag/clown/cream_pie) + contains = list(/obj/item/weapon/storage/backpack/duffelbag/clown/cream_pie) crate_name = "party equipment crate" contraband = TRUE access = GLOB.access_theatre diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index e34e7763b34..7130f12c49a 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -43,7 +43,7 @@ Captain backpack = /obj/item/weapon/storage/backpack/captain satchel = /obj/item/weapon/storage/backpack/satchel/cap - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/captain + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/captain implants = list(/obj/item/weapon/implant/mindshield) diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 18c26349fb3..b482c791172 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -94,7 +94,7 @@ Shaft Miner backpack = /obj/item/weapon/storage/backpack/explorer satchel = /obj/item/weapon/storage/backpack/satchel/explorer - dufflebag = /obj/item/weapon/storage/backpack/dufflebag + duffelbag = /obj/item/weapon/storage/backpack/duffelbag box = /obj/item/weapon/storage/box/survival_mining /datum/outfit/job/miner/asteroid diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index 704496ad67b..ab858f4986d 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -43,7 +43,7 @@ Clown backpack = /obj/item/weapon/storage/backpack/clown satchel = /obj/item/weapon/storage/backpack/clown - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/clown //strangely has a duffle + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/clown //strangely has a duffel box = /obj/item/weapon/storage/box/hug/survival diff --git a/code/modules/jobs/job_types/engineering.dm b/code/modules/jobs/job_types/engineering.dm index 941da424295..13853cb0676 100644 --- a/code/modules/jobs/job_types/engineering.dm +++ b/code/modules/jobs/job_types/engineering.dm @@ -42,7 +42,7 @@ Chief Engineer backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel/eng - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering box = /obj/item/weapon/storage/box/engineer pda_slot = slot_l_store @@ -93,7 +93,7 @@ Station Engineer backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel/eng - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering box = /obj/item/weapon/storage/box/engineer pda_slot = slot_l_store backpack_contents = list(/obj/item/device/modular_computer/tablet/preset/advanced=1) @@ -144,7 +144,7 @@ Atmospheric Technician backpack = /obj/item/weapon/storage/backpack/industrial satchel = /obj/item/weapon/storage/backpack/satchel/eng - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/engineering + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/engineering box = /obj/item/weapon/storage/box/engineer pda_slot = slot_l_store backpack_contents = list(/obj/item/device/modular_computer/tablet/preset/advanced=1) diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm index 43c70482613..2632c28cdd7 100644 --- a/code/modules/jobs/job_types/job.dm +++ b/code/modules/jobs/job_types/job.dm @@ -134,7 +134,7 @@ var/backpack = /obj/item/weapon/storage/backpack var/satchel = /obj/item/weapon/storage/backpack/satchel - var/dufflebag = /obj/item/weapon/storage/backpack/dufflebag + var/duffelbag = /obj/item/weapon/storage/backpack/duffelbag var/box = /obj/item/weapon/storage/box/survival var/pda_slot = slot_belt @@ -145,14 +145,14 @@ back = /obj/item/weapon/storage/backpack //Grey backpack if(GSATCHEL) back = /obj/item/weapon/storage/backpack/satchel //Grey satchel - if(GDUFFLEBAG) - back = /obj/item/weapon/storage/backpack/dufflebag //Grey Dufflebag + if(GDUFFELBAG) + back = /obj/item/weapon/storage/backpack/duffelbag //Grey Duffel bag if(LSATCHEL) back = /obj/item/weapon/storage/backpack/satchel/leather //Leather Satchel if(DSATCHEL) back = satchel //Department satchel - if(DDUFFLEBAG) - back = dufflebag //Department dufflebag + if(DDUFFELBAG) + back = duffelbag //Department duffel bag else back = backpack //Department backpack diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 4a59ed2cd54..784e1ce50b5 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -40,7 +40,7 @@ Chief Medical Officer backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel/med - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med /* Medical Doctor @@ -75,7 +75,7 @@ Medical Doctor backpack = /obj/item/weapon/storage/backpack/medic satchel = /obj/item/weapon/storage/backpack/satchel/med - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med /* Chemist @@ -109,7 +109,7 @@ Chemist backpack = /obj/item/weapon/storage/backpack/chemistry satchel = /obj/item/weapon/storage/backpack/satchel/chem - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med /* Geneticist @@ -143,7 +143,7 @@ Geneticist backpack = /obj/item/weapon/storage/backpack/genetics satchel = /obj/item/weapon/storage/backpack/satchel/gen - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med /* Virologist @@ -178,4 +178,4 @@ Virologist backpack = /obj/item/weapon/storage/backpack/virology satchel = /obj/item/weapon/storage/backpack/satchel/vir - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/med + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/med diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index d5fc677208f..840fab8d986 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -52,7 +52,7 @@ Head of Security backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel/sec - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec box = /obj/item/weapon/storage/box/security implants = list(/obj/item/weapon/implant/mindshield) @@ -101,7 +101,7 @@ Warden backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel/sec - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec box = /obj/item/weapon/storage/box/security implants = list(/obj/item/weapon/implant/mindshield) @@ -279,7 +279,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S backpack = /obj/item/weapon/storage/backpack/security satchel = /obj/item/weapon/storage/backpack/satchel/sec - dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec + duffelbag = /obj/item/weapon/storage/backpack/duffelbag/sec box = /obj/item/weapon/storage/box/security implants = list(/obj/item/weapon/implant/mindshield) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index c2ae6f7e353..a3ed32c3dd5 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -192,7 +192,7 @@ new /obj/item/weapon/storage/belt/mining/alt(loc) new /obj/item/weapon/extinguisher/mini(loc) if("Mining Conscription Kit") - new /obj/item/weapon/storage/backpack/dufflebag/mining_conscript(loc) + new /obj/item/weapon/storage/backpack/duffelbag/mining_conscript(loc) SSblackbox.add_details("mining_voucher_redeemed", selection) qdel(voucher) @@ -282,11 +282,11 @@ qdel(src) ..() -/obj/item/weapon/storage/backpack/dufflebag/mining_conscript +/obj/item/weapon/storage/backpack/duffelbag/mining_conscript name = "mining conscription kit" desc = "A kit containing everything a crewmember needs to support a shaft miner in the field." -/obj/item/weapon/storage/backpack/dufflebag/mining_conscript/New() +/obj/item/weapon/storage/backpack/duffelbag/mining_conscript/New() ..() new /obj/item/weapon/pickaxe/mini(src) new /obj/item/clothing/glasses/meson(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index b8f598c6831..0311acb7de4 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -19,7 +19,7 @@ icon_door = "mixed" /obj/structure/closet/wardrobe/miner/PopulateContents() - new /obj/item/weapon/storage/backpack/dufflebag(src) + new /obj/item/weapon/storage/backpack/duffelbag(src) new /obj/item/weapon/storage/backpack/explorer(src) new /obj/item/weapon/storage/backpack/satchel/explorer(src) new /obj/item/clothing/under/rank/miner/lavaland(src) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index dc1ae366044..9a12938163d 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -61,7 +61,7 @@ var/alarms = list("Atmosphere" = list(), "Fire" = list(), "Power" = list()) var/obj/item/internal_storage //Drones can store one item, of any size/type in their body var/obj/item/head - var/obj/item/default_storage = /obj/item/weapon/storage/backpack/dufflebag/drone //If this exists, it will spawn in internal storage + var/obj/item/default_storage = /obj/item/weapon/storage/backpack/duffelbag/drone //If this exists, it will spawn in internal storage var/obj/item/default_hatmask //If this exists, it will spawn in the hat/mask slot if it can fit var/seeStatic = 1 //Whether we see static instead of mobs var/visualAppearence = MAINTDRONE //What we appear as diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index a441afbdaf0..5eea418d6ad 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -145,21 +145,21 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/nukeoffer/c20r name = "C-20r bundle" desc = "Old faithful: The classic C-20r, bundled with two magazines, and a (surplus) suppressor at discount price." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/c20rbundle cost = 14 // normally 16 /datum/uplink_item/nukeoffer/bulldog name = "Bulldog bundle" desc = "Lean and mean: Optimised for people that want to get up close and personal. Contains the popular \ Bulldog shotgun, two 12g drums, and a pair of Thermal imaging goggles." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/bulldogbundle + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/bulldogbundle cost = 13 // normally 16 /datum/uplink_item/nukeoffer/medical name = "Medical bundle" desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a Donksoft machine gun, \ a box of ammo, and a pair of magboots to rescue your friends in no-gravity environments." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/med/medicalbundle + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/med/medicalbundle cost = 15 // normally 20 /datum/uplink_item/nukeoffer/sniper @@ -173,13 +173,13 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. name = "Bioterror bundle" desc = "For the madman: Contains Bioterror spray, Bioterror grenade, chemicals, syringe gun, box of syringes,\ Donksoft assault rifle, and some darts. Remember: Seal suit and equip internals before use." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/med/bioterrorbundle + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/med/bioterrorbundle cost = 30 // normally 42 /datum/uplink_item/nukeoffer/firestarter name = "Spetsnaz Pyro bundle" desc = "For systematic suppression of carbon lifeforms in close range: Contains a specialist Pyrotechnic equipment, foreign pistol, two magazines, a pipebomb, and a stimulant syringe." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/firestarter + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/firestarter cost = 30 // Dangerous Items @@ -455,9 +455,9 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. include_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/shotgun/bag - name = "12g Ammo Dufflebag" - desc = "A dufflebag filled with enough 12g ammo to supply an entire team, at a discounted price." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun + name = "12g Ammo Duffel Bag" + desc = "A duffel bag filled with enough 12g ammo to supply an entire team, at a discounted price." + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/shotgun cost = 12 /datum/uplink_item/ammo/smg @@ -469,9 +469,9 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) /datum/uplink_item/ammo/smg/bag - name = ".45 Ammo Dufflebag" - desc = "A dufflebag filled with enough .45 ammo to supply an entire team, at a discounted price." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg + name = ".45 Ammo Duffel Bag" + desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price." + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg cost = 20 include_modes = list(/datum/game_mode/nuclear) @@ -890,10 +890,10 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. cost = 1 /datum/uplink_item/device_tools/surgerybag - name = "Syndicate Surgery Dufflebag" - desc = "The Syndicate surgery dufflebag is a toolkit containing all surgery tools, surgical drapes, \ + name = "Syndicate Surgery Duffel Bag" + desc = "The Syndicate surgery duffel bag is a toolkit containing all surgery tools, surgical drapes, \ a Syndicate brand MMI, a straitjacket, and a muzzle." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/surgery + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/surgery cost = 3 /datum/uplink_item/device_tools/military_belt @@ -999,7 +999,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/c4bag name = "Bag of C-4 explosives" desc = "Because sometimes quantity is quality. Contains 10 C-4 plastic explosives." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c4 + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/c4 cost = 9 //10% discount! cant_discount = TRUE @@ -1007,7 +1007,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. name = "Bag of X-4 explosives" desc = "Contains 3 X-4 plastic explosives. Similar, but more powerful than C-4. X-4 can be placed on a solid surface, such as a wall or window, and it will \ blast through the wall, injuring anything on the opposite side, while being safer to the user. For when you want a wider, deeper, hole." - item = /obj/item/weapon/storage/backpack/dufflebag/syndie/x4 + item = /obj/item/weapon/storage/backpack/duffelbag/syndie/x4 cost = 4 // cant_discount = TRUE diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 19e2cc0e483e475e0f1b56e56279a12410cfeaf4..9f438af031800aa90470ae33a49dff133c084115 100644 GIT binary patch delta 440 zcmV;p0Z0C*%mb**1F!=Ff2ea?>Sb3q``y$e>hxZ9*}2AD?pFc z1~*}&Ny;rt(zzUZKq=yziJc2;eVCYA`Znt0$z+9n4lXn&8ixIj=X&SlH~Vhhv&(>+ zc(yV4(2EVaUCkK%$qx{BM`CZ^G`>R`J>Tg?c%Xr!p{9I6a^C@6S{D+amNy~tAxBE= zUo-iN;{TF8d;8bPe^>JA$#%e$|A^4p8~z4;3_8Tmzf~`er(X!@1dhm{+kJn)Zw414 zkYr{MOUIE?LQ?#)J*DApB#cSVN*t~N~HaqdE-Wg1b)!e z-XBSN$Nui$XP-3rN-Q#_LrN={>!GsSL`GUW@r~osQMRrADKZSBf#DowfZ;y)jwd@B i=yNsy=mqexczSs(9=|>>{sCt4ZAA8#N?Wt31b^Ys3e{c! delta 440 zcmV;p0Z0C*%mb**1F!=Ff0%A;u`6)ubU-6@nZTVFPh1i2(w?yq2fE`~K)V@LdBr8II*{6sOP5;%E%V z)P`I_FC5M-IT$zOJy?(4(5nde-5ze-2)KwCAjZ2838+Li(qKXWe;h6{56H8m6`;pz zgPX9?B;}SR>0AyypcL`V#Lk7aK1|FleH-=hWU|6O2N#+X4a0uNbG>u&n|(L$*=4{@ zJlhz2=*0%zu4at>MhK(=P;c0!L)f?Y=+YH-ifi zNHQ~srQ=8`Au0abC`jYgx-F>pr!xtJ(~i_bY9{rmPY%JEuqh)~CDMM*ym2E#0zYVK z?~f$CV}JMWvrn3QB^DXeA*B_}^-$SuA|tJx_{MSRDBD(lDH(>*z;KQ-z;GXY$CDim i^tqaU^aA);JiR;?k6)h`{{Uw=ZA32p4Vbg31b^XuwbS+h