From a4c9dc43dd0fba27c381e637fbd441f94b4325fc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:42:05 -0500 Subject: [PATCH] Dufflebag => Dufflebag --- code/_globalvars/lists/flavor_misc.dm | 6 ++-- .../items/stacks/sheets/sheet_types.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 24 +++++++------- .../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 | 4 +-- code/modules/jobs/job_types/cargo_service.dm | 2 +- code/modules/jobs/job_types/civilian.dm | 2 +- code/modules/jobs/job_types/engineering.dm | 16 +++++----- code/modules/jobs/job_types/job.dm | 10 +++--- code/modules/jobs/job_types/medical.dm | 10 +++--- code/modules/jobs/job_types/security.dm | 20 ++++++------ 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 +++++++++---------- 20 files changed, 75 insertions(+), 75 deletions(-) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index e3f1b01590..9471b9ba32 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 duffelbag" #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 duffelbag" +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 61abe97859..576fdb6763 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("duffelbag", /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/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index ca304dc62f..2abc876238 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -15,8 +15,8 @@ new /obj/item/clothing/under/sl_suit(src) new /obj/item/clothing/under/rank/bartender(src) new /obj/item/clothing/under/rank/bartender(src) - new /obj/item/clothing/accessory/waistcoat(src) - new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/shoes/sneakers/black(src) @@ -39,8 +39,8 @@ new /obj/item/clothing/under/waiter(src) new /obj/item/device/radio/headset/headset_srv(src) new /obj/item/device/radio/headset/headset_srv(src) - new /obj/item/clothing/accessory/waistcoat(src) - new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) for(var/i in 1 to 3) new /obj/item/clothing/suit/apron/chef(src) new /obj/item/clothing/head/soft/mime(src) @@ -64,7 +64,7 @@ new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/head/soft/purple(src) new /obj/item/weapon/paint/paint_remover(src) - new /obj/item/weapon/melee/flyswatter(src) + new /obj/item/weapon/melee/flyswatter(src) new /obj/item/device/flashlight(src) for(var/i in 1 to 3) new /obj/item/weapon/caution(src) @@ -95,8 +95,8 @@ new /obj/item/clothing/suit/toggle/lawyer/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/clothing/shoes/laceup(src) - new /obj/item/clothing/accessory/lawyers_badge(src) - new /obj/item/clothing/accessory/lawyers_badge(src) + new /obj/item/clothing/accessory/lawyers_badge(src) + new /obj/item/clothing/accessory/lawyers_badge(src) /obj/structure/closet/wardrobe/chaplain_black name = "chapel wardrobe" @@ -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 aaf40e634b..6a07f57244 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 c9638afadf..baaa1ea297 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 c51c543f26..c763b4a5ad 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -12,7 +12,7 @@ new /obj/item/weapon/storage/backpack/satchel/cap(src) new /obj/item/clothing/neck/cloak/cap(src) new /obj/item/weapon/storage/daki(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 c09f3d2ff7..a8dffbd97d 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 7b1ff30b45..c0c63f6db7 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 4c3c6572a2..9f9c897cf0 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 cf9560a9d2..53ba9fceed 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -39,11 +39,11 @@ Captain suit = /obj/item/clothing/suit/armor/vest/capcarapace shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat - backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/weapon/station_charter=1) + backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/weapon/station_charter=1) 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 18c26349fb..b482c79117 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 704496ad67..8b6d10cab8 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 duffle 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 f101acbc91..00ab8de1f7 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,16 +93,16 @@ 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) -/datum/outfit/job/engineer/gloved - name = "Station Engineer (Gloves)" - gloves = /obj/item/clothing/gloves/color/yellow - -/datum/outfit/job/engineer/gloved/rig +/datum/outfit/job/engineer/gloved + name = "Station Engineer (Gloves)" + gloves = /obj/item/clothing/gloves/color/yellow + +/datum/outfit/job/engineer/gloved/rig name = "Station Engineer (Hardsuit)" mask = /obj/item/clothing/mask/breath @@ -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 43c7048261..d36f9b3589 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 duffelbag 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 duffelbag else back = backpack //Department backpack diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 0b97f97dd7..66a34a0981 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 3756d1e3e7..9ebc9b3315 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) @@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S else department = pick_n_take(GLOB.available_depts) var/ears = null - var/accessory = null + var/accessory = null var/list/dep_access = null var/destination = null var/spawn_point = null @@ -205,29 +205,29 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S dep_access = list(GLOB.access_mailsorting, GLOB.access_mining, GLOB.access_mining_station) destination = /area/security/checkpoint/supply spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns - accessory = /obj/item/clothing/accessory/armband/cargo + accessory = /obj/item/clothing/accessory/armband/cargo if(SEC_DEPT_ENGINEERING) ears = /obj/item/device/radio/headset/headset_sec/alt/department/engi dep_access = list(GLOB.access_construction, GLOB.access_engine) destination = /area/security/checkpoint/engineering spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns - accessory = /obj/item/clothing/accessory/armband/engine + accessory = /obj/item/clothing/accessory/armband/engine if(SEC_DEPT_MEDICAL) ears = /obj/item/device/radio/headset/headset_sec/alt/department/med dep_access = list(GLOB.access_medical) destination = /area/security/checkpoint/medical spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns - accessory = /obj/item/clothing/accessory/armband/medblue + accessory = /obj/item/clothing/accessory/armband/medblue if(SEC_DEPT_SCIENCE) ears = /obj/item/device/radio/headset/headset_sec/alt/department/sci dep_access = list(GLOB.access_research) destination = /area/security/checkpoint/science spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns - accessory = /obj/item/clothing/accessory/armband/science + accessory = /obj/item/clothing/accessory/armband/science - if(accessory) + if(accessory) var/obj/item/clothing/under/U = H.w_uniform - U.attach_accessory(new accessory) + U.attach_accessory(new accessory) if(ears) if(H.ears) qdel(H.ears) @@ -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 c2ae6f7e35..a3ed32c3dd 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 b8f598c683..0311acb7de 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 d675458485..38791f92d4 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 2cce33926d..3571bccf1f 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 duffelbag" + desc = "A duffelbag 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 duffelbag" + desc = "A duffelbag 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) @@ -899,10 +899,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 duffelbag" + desc = "The Syndicate surgery duffelbag 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 @@ -1008,7 +1008,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 @@ -1016,7 +1016,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