From 323ffa1fca0ea0044d55e41a8dda5086f21171fe Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:19:46 -0500 Subject: [PATCH 1/4] Fixes dufflebag worn icons not displaying --- icons/mob/back.dmi | Bin 92149 -> 92146 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 55d36996b7c9d621f523797bf1dc53539b819147..2bdb8196014fa628d04c00213384be15c7e3f420 100644 GIT binary patch delta 917 zcmV;G18V&B&js?&1&|~GXOSgJ1Effak#cAUXfqSH;R_p);Ti$+k^CY8c$bqP0UCdF zW-ZpFz=+s@YVZ_C5j-6j5v$qM80*rbd6wG1{OYYt4VG#dOx0S*6j6VM%SC*~mvRyQlP7o!Nlt3jMq} z=*6sKFLy*^Ac|oq%+?vUr=}_^a>*+ea&pI;e*`T(ba@tElXF_ zo?Y7670WtirO}GO7M-kUL_UhRJ)NFq#O>-v5Ud$Z&oj?xy7hWS1xH{;({DaOBgTLK z`CTx}p>M}h*n0H_f&~k%jNkrvd1YfbOM1!3ZjtysY;{|`0ae-H65E$*K z7tEI@Y-1rEV5QNDJH={Hoe}8oNp)~sZ0GBx7zn{y3TieXqQv!%qa2>vyb#&jbW^C= zbpkKx#^cWcof-v4kR6t?R|s}kh8{sOQ_Mr|u{Z1mCeNTOaf0c{wPiT4PrKLyxrz^! zY-H)tn94wX;mRx?s=j~bMPB6hd65^(2fWh@W2wPf^cUNjm0|8*s{T39UJ_hF&%Fj0 zOJ#=YTE46hlwf{*z04!jwBvZhGm3}(;oPGQ8kUe~VT>l52p>;xJLNfY;mjt($1OZ-ScCEO# delta 948 zcmV;l155n!&jt0*1&|~GYLO*M1C&ULk#cAU=r9wv;R^?m;Ti$*k^CY8_>_|%0UCc4 zvleSoU_@*{HF%1n2%Z8)#A-G*x%M*qctj>6V&UL7U#`1f~nf1a8wC)g0R) zoyR80*rbd5F7;R9HwPt_TVmj;0tkP)3u%tH6Y~-Vu-BUVNXEtEELO&l4 zdNJ$R%MH;Oh+Kg9(>h zyyzxx^V?Tz1jp@?!abcY0wgHCT)OVq3E^%>7H%KL^@NoJ;7r z*WhBQ%urp+mlc8%%#W{^d4zg=d)3`9k9P?%@9yC}X(0}-_bj9G4vd>T~>U_ix<6lW2n`!2i28V*y4Z9$MA)yiaA`^&IhD% zlP=GVfuMy``+_YS13{-f(~V^{m{yRW<|mKzEOCDF5V959Dvh4=uHXyWly`+>=n*6b zo2`{b=dTo!DPX}$Kb?HezWsQ}9=<=W{{x;|bwavl*R}uvAOJ~3K~#90?A?1@RCWG8 W@YfMEZXzhC2#ABQ1h=pR0YYQmo4k7f From 52fa6e4df866c78b766c244c795dc94d447969b7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:25:07 -0500 Subject: [PATCH 2/4] wrong way around --- .../objects/items/weapons/storage/backpack.dm | 172 +++++++++--------- icons/mob/back.dmi | Bin 92146 -> 92149 bytes 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index f625766932..5dbd79fe0d 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -69,7 +69,7 @@ var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [name]?", "Proceed", "Abort") if(safety == "Abort" || !in_range(src, user) || !src || !W || user.incapacitated()) return - investigate_log("has become a singularity. Caused by [user.key]", INVESTIGATE_SINGULO) + investigate_log("has become a singularity. Caused by [user.key]", INVESTIGATE_SINGULO) to_chat(user, "The Bluespace interfaces of the two devices catastrophically malfunction!") qdel(W) var/obj/singularity/singulo = new /obj/singularity (get_turf(src)) @@ -83,7 +83,7 @@ /obj/item/weapon/storage/backpack/holding/singularity_act(current_size) var/dist = max((current_size - 2),1) - explosion(src.loc,(dist),(dist*2),(dist*4)) + explosion(src.loc,(dist),(dist*2),(dist*4)) return @@ -316,48 +316,48 @@ 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 = "duffelbag" + desc = "A large duffelbag 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 duffelbag" + desc = "A large duffelbag 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 duffelbag" + desc = "A large duffelbag 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/sec + name = "security duffelbag" + desc = "A large duffelbag for holding extra security supplies and ammunition." + icon_state = "duffel-sec" + item_state = "duffel-sec" -/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/engineering + name = "industrial duffelbag" + desc = "A large duffelbag 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 duffelbag" + desc = "A large duffelbag 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 +366,38 @@ 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 duffelbag" + desc = "A large duffelbag 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 duffelbag" + desc = "A large duffelbag 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/med + name = "medical duffelbag" + desc = "A large duffelbag for holding extra tactical medical supplies." + icon_state = "duffel-syndiemed" + item_state = "duffel-syndiemed" -/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/surgery + name = "surgery duffelbag" + desc = "A suspicious looking duffelbag for holding surgery tools." + icon_state = "duffel-syndiemed" + item_state = "duffel-syndiemed" -/obj/item/weapon/storage/backpack/dufflebag/syndie/surgery/PopulateContents() +/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 +409,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 duffelbag" + desc = "A large duffelbag 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 duffelbag, 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 duffelbag, 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 duffelbag 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 duffelbag 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 duffelbag 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 duffelbag 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 duffelbag 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 +480,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 duffelbag 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/icons/mob/back.dmi b/icons/mob/back.dmi index 2bdb8196014fa628d04c00213384be15c7e3f420..55d36996b7c9d621f523797bf1dc53539b819147 100644 GIT binary patch delta 948 zcmV;l155n!&jt0*1&|~GYLO*M1C&ULk#cAU=r9wv;R^?m;Ti$*k^CY8_>_|%0UCc4 zvleSoU_@*{HF%1n2%Z8)#A-G*x%M*qctj>6V&UL7U#`1f~nf1a8wC)g0R) zoyR80*rbd5F7;R9HwPt_TVmj;0tkP)3u%tH6Y~-Vu-BUVNXEtEELO&l4 zdNJ$R%MH;Oh+Kg9(>h zyyzxx^V?Tz1jp@?!abcY0wgHCT)OVq3E^%>7H%KL^@NoJ;7r z*WhBQ%urp+mlc8%%#W{^d4zg=d)3`9k9P?%@9yC}X(0}-_bj9G4vd>T~>U_ix<6lW2n`!2i28V*y4Z9$MA)yiaA`^&IhD% zlP=GVfuMy``+_YS13{-f(~V^{m{yRW<|mKzEOCDF5V959Dvh4=uHXyWly`+>=n*6b zo2`{b=dTo!DPX}$Kb?HezWsQ}9=<=W{{x;|bwavl*R}uvAOJ~3K~#90?A?1@RCWG8 W@YfMEZXzhC2#ABQ1h=pR0YYQmo4k7f delta 917 zcmV;G18V&B&js?&1&|~GXOSgJ1Effak#cAUXfqSH;R_p);Ti$+k^CY8c$bqP0UCdF zW-ZpFz=+s@YVZ_C5j-6j5v$qM80*rbd6wG1{OYYt4VG#dOx0S*6j6VM%SC*~mvRyQlP7o!Nlt3jMq} z=*6sKFLy*^Ac|oq%+?vUr=}_^a>*+ea&pI;e*`T(ba@tElXF_ zo?Y7670WtirO}GO7M-kUL_UhRJ)NFq#O>-v5Ud$Z&oj?xy7hWS1xH{;({DaOBgTLK z`CTx}p>M}h*n0H_f&~k%jNkrvd1YfbOM1!3ZjtysY;{|`0ae-H65E$*K z7tEI@Y-1rEV5QNDJH={Hoe}8oNp)~sZ0GBx7zn{y3TieXqQv!%qa2>vyb#&jbW^C= zbpkKx#^cWcof-v4kR6t?R|s}kh8{sOQ_Mr|u{Z1mCeNTOaf0c{wPiT4PrKLyxrz^! zY-H)tn94wX;mRx?s=j~bMPB6hd65^(2fWh@W2wPf^cUNjm0|8*s{T39UJ_hF&%Fj0 zOJ#=YTE46hlwf{*z04!jwBvZhGm3}(;oPGQ8kUe~VT>l52p>;xJLNfY;mjt($1OZ-ScCEO# From a4c9dc43dd0fba27c381e637fbd441f94b4325fc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:42:05 -0500 Subject: [PATCH 3/4] 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 From eb055bc1ecdd7e8c52b6ab9af5e954ba058fa667 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 19 Jun 2017 16:56:38 -0500 Subject: [PATCH 4/4] more and more --- .../LavaRuins/lavaland_biodome_beach.dmm | 2 +- .../lavaland_surface_animal_hospital.dmm | 2 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 2 +- _maps/RandomZLevels/snowdin.dmm | 2 +- _maps/map_files/Deltastation/DeltaStation2.dmm | 8 ++++---- _maps/map_files/MetaStation/MetaStation.dmm | 18 +++++++++--------- _maps/map_files/PubbyStation/PubbyStation.dmm | 6 +++--- _maps/shuttles/whiteship_meta.dmm | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 1a4f7aacbb..35960074c1 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 127d5b3d55..288f5fd12c 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 43258deaf8..790868ded7 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{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 duffelbag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "duffelbag"; 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 bac50dd89a..f6b56c5c04 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 e8caec4ba3..d1fa54cb5d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -19435,10 +19435,10 @@ /obj/item/weapon/reagent_containers/glass/bottle/facid{ pixel_x = 7 }, -/obj/item/weapon/storage/backpack/dufflebag/sec{ +/obj/item/weapon/storage/backpack/duffelbag/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"; + desc = "A large duffelbag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; + name = "duffelbag"; pixel_y = 5 }, /turf/open/floor/plasteel/darkred/side{ @@ -89345,7 +89345,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 6be7048719..aeb0e2209c 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1847,10 +1847,10 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/sec{ +/obj/item/weapon/storage/backpack/duffelbag/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"; + desc = "A large duffelbag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; + name = "duffelbag"; pixel_y = 5 }, /obj/item/clothing/mask/balaclava, @@ -15125,9 +15125,9 @@ /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{ +/obj/item/weapon/storage/backpack/duffelbag{ 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."; + desc = "A large duffelbag for holding extra things. There is a NanoTrasen logo on the back."; icon_state = "duffle-syndieammo"; item_state = "duffle-syndieammo" }, @@ -73623,7 +73623,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 @@ -82857,10 +82857,10 @@ /area/shuttle/abandoned) "cYD" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/med{ +/obj/item/weapon/storage/backpack/duffelbag/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"; + desc = "A large duffelbag for holding extra medical supplies - this one seems to be designed for holding surgical tools."; + name = "surgical duffelbag"; 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 3cdd0c36fc..67ed1464d8 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2378,10 +2378,10 @@ pixel_y = 0 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/sec{ +/obj/item/weapon/storage/backpack/duffelbag/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"; + desc = "A large duffelbag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; + name = "duffelbag"; pixel_y = 5 }, /obj/item/clothing/mask/balaclava, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index c51b9cac8b..23e39ebd86 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1747,10 +1747,10 @@ /area/shuttle/abandoned) "db" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/dufflebag/med{ +/obj/item/weapon/storage/backpack/duffelbag/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"; + desc = "A large duffelbag for holding extra medical supplies - this one seems to be designed for holding surgical tools."; + name = "surgical duffelbag"; pixel_y = 4 }, /turf/open/floor/mineral/titanium,