From 474794a2ffa9f0bd0a92ca54c420126e78d84901 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 15 Feb 2021 16:52:09 -0500 Subject: [PATCH] Fix Bugs - Adds return to Ore New() - Fixes wrong typepath for Merc thermals --- code/modules/mining/ore.dm | 1 + maps/submaps/admin_use_vr/kk_mercship.dmm | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index b067a356331..b97355b249f 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -114,6 +114,7 @@ material = null /obj/item/weapon/ore/New() + ..() randpixel_xy() /obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index 1b80d94702b..5de144facc3 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -455,11 +455,6 @@ /area/ship/manta/armoury_st) "bL" = ( /obj/structure/table/rack, -/obj/item/borg/sight/thermal, -/obj/item/borg/sight/thermal, -/obj/item/borg/sight/thermal, -/obj/item/borg/sight/thermal, -/obj/item/borg/sight/thermal, /obj/effect/floor_decal/techfloor{ dir = 5 }, @@ -469,6 +464,12 @@ /obj/machinery/light_switch{ pixel_y = 23 }, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bP" = (