From ce315815fa9fd806ff3b254027db642656d65371 Mon Sep 17 00:00:00 2001 From: Lohikar Date: Mon, 26 Jun 2017 11:26:24 -0500 Subject: [PATCH] Lamar is back in a cage (#2785) Puts Lamarr back in its cage. 2017-06-21_18-00-23 Also removes a pointless New() override on Lamarr. --- code/game/objects/structures/lamarr_cage.dm | 3 --- maps/Aurora-MapDev/aurora-3.dmm | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index f418d54adff..94019494d02 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -99,9 +99,6 @@ var/const/MAX_ACTIVE_TIME = 400 var/attached = 0 var/sterile = 1 -/obj/item/clothing/mask/lamarr/New()//to prevent deleting it if aliums are disabled - return - /obj/item/clothing/mask/lamarr/attack_hand(user as mob) if((stat == CONSCIOUS)) diff --git a/maps/Aurora-MapDev/aurora-3.dmm b/maps/Aurora-MapDev/aurora-3.dmm index 95ff354510a..3377a2fe873 100644 --- a/maps/Aurora-MapDev/aurora-3.dmm +++ b/maps/Aurora-MapDev/aurora-3.dmm @@ -3961,7 +3961,7 @@ "byi" = (/obj/structure/grille,/obj/machinery/door/firedoor,/obj/structure/window/reinforced/polarized{dir = 8;id = "chapel"},/obj/structure/window/reinforced/polarized{dir = 4;id = "chapel"},/obj/structure/window/reinforced/polarized{id = "chapel"},/turf/simulated/floor/plating,/area/chapel/main) "byj" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/carpet/blue,/area/rnd/rdoffice) "byk" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/chapel{icon_state = "chapel";dir = 8},/obj/effect/floor_decal/chapel,/turf/simulated/floor/tiled/dark,/area/chapel/main) -"byl" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/effect/floor_decal/corner/purple{dir = 6},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/clothing/mask/lamarr,/obj/machinery/door/window/brigdoor/eastleft{req_access = list(30)},/obj/structure/window/reinforced,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 1},/turf/simulated/floor/tiled,/area/rnd/rdoffice) +"byl" = (/obj/effect/floor_decal/corner/purple{dir = 9},/obj/effect/floor_decal/corner/purple{dir = 6},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/lamarr,/turf/simulated/floor/tiled,/area/rnd/rdoffice) "bym" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/chapel{icon_state = "chapel";dir = 4},/obj/effect/floor_decal/chapel{icon_state = "chapel";dir = 8},/turf/simulated/floor/tiled/dark,/area/chapel/main) "byn" = (/obj/effect/floor_decal/corner/grey/diagonal,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "byo" = (/obj/item/weapon/stool/padded,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/floor_decal/chapel,/obj/effect/floor_decal/chapel,/obj/effect/floor_decal/chapel{icon_state = "chapel";dir = 8},/turf/simulated/floor/tiled/dark,/area/chapel/main)