From 22a9b32a2972306260750facfaef5a5de98d31b6 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 29 Apr 2016 19:08:04 -0500 Subject: [PATCH] Fixed the map thing and a few other issues. --- code/datums/supplypacks.dm | 8 ++++---- .../objects/structures/crates_lockers/closets/wardrobe.dm | 4 ++-- maps/RandomZLevels/zresearchlabs.dmm | 2 +- maps/polaris-1.dmm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index f39c7c6f98..ce50aedcc7 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1891,8 +1891,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/navybluesecurityclothing name = "Navy blue security uniform crate" - contains = list(/obj/item/weapon/storage/backpack/satchel_sec, - /obj/item/weapon/storage/backpack/satchel_sec, + contains = list(/obj/item/weapon/storage/backpack/satchel/sec, + /obj/item/weapon/storage/backpack/satchel/sec, /obj/item/weapon/storage/backpack/security, /obj/item/weapon/storage/backpack/security, /obj/item/clothing/under/rank/security/navyblue, @@ -1926,8 +1926,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/corporatesecurityclothing name = "Corporate security uniform crate" - contains = list(/obj/item/weapon/storage/backpack/satchel_sec, - /obj/item/weapon/storage/backpack/satchel_sec, + contains = list(/obj/item/weapon/storage/backpack/satchel/sec, + /obj/item/weapon/storage/backpack/satchel/sec, /obj/item/weapon/storage/backpack/security, /obj/item/weapon/storage/backpack/security, /obj/item/clothing/under/rank/security/corp, diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 1e7e401d58..0736a13f13 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -382,8 +382,8 @@ new /obj/item/clothing/gloves/black(src) new /obj/item/weapon/storage/backpack/toxins(src) new /obj/item/weapon/storage/backpack/toxins(src) - new /obj/item/weapon/storage/backpack/satchel_tox(src) - new /obj/item/weapon/storage/backpack/satchel_tox(src) + new /obj/item/weapon/storage/backpack/satchel/tox(src) + new /obj/item/weapon/storage/backpack/satchel/tox(src) return diff --git a/maps/RandomZLevels/zresearchlabs.dmm b/maps/RandomZLevels/zresearchlabs.dmm index ab02373084..c749e01a21 100644 --- a/maps/RandomZLevels/zresearchlabs.dmm +++ b/maps/RandomZLevels/zresearchlabs.dmm @@ -1049,7 +1049,7 @@ "ui" = (/obj/structure/closet/secure_closet/warden,/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uj" = (/obj/structure/rack,/obj/item/ammo_magazine/c45,/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/awaymission/labs/security) "uk" = (/obj/structure/rack,/obj/item/ammo_magazine/c45,/obj/item/weapon/gun/projectile/silenced/sc_silenced{desc = "A sidearm commonly favored by terrestrial security forces."; icon_state = "g115 Pistol"; name = "Pistol"; silenced = 0},/turf/simulated/floor{tag = "icon-vault (WEST)"; icon_state = "vault"; dir = 8},/area/awaymission/labs/security) -"ul" = (/obj/structure/table/standard,/obj/item/weapon/storage/backpack/satchel_med,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) +"ul" = (/obj/structure/table/standard,/obj/item/weapon/storage/backpack/satchel/med,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) "um" = (/obj/machinery/computer/prisoner,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "un" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "showroomfloor"},/area/awaymission/labs/security) "uo" = (/obj/structure/table/standard,/obj/item/weapon/gun/syringe/rapidsyringe,/turf/simulated/floor{icon_state = "white"},/area/awaymission/labs/medical) diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index 913aff3d98..33ed72d1b9 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -4539,7 +4539,7 @@ "bJo" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bJp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bJq" = (/obj/structure/sign/goldenplaque{desc = "Done No Harm."; name = "Best Doctor 2552"; pixel_y = -32},/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/medical/sleeper) -"bJr" = (/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/item/weapon/storage/backpack/satchel_vir,/obj/item/weapon/storage/backpack/virology,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) +"bJr" = (/obj/structure/closet,/obj/item/device/flashlight,/obj/effect/decal/cleanable/cobweb2,/obj/item/weapon/storage/backpack/satchel/vir,/obj/item/weapon/storage/backpack/virology,/turf/simulated/floor/plating,/area/maintenance/medbay_fore) "bJs" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bJt" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bJu" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/tiled/white,/area/medical/sleeper)