From 24ed6b30aa96970a6b14fa2040ae5b62d2c03627 Mon Sep 17 00:00:00 2001 From: tortellinitony Date: Tue, 18 Jul 2017 19:39:26 -0400 Subject: [PATCH 1/2] Fixes the party alarm --- code/game/machinery/firealarm.dm | 47 ++++++++++---------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 8c5eb87965a..23a08820eb0 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -262,39 +262,6 @@ name = "\improper PARTY BUTTON" desc = "Cuban Pete is in the house!" -/obj/machinery/firealarm/partyalarm/attack_hand(mob/user) - if((user.stat && !IsAdminGhost(user)) || stat & (NOPOWER|BROKEN)) - return - - if (buildstage != 2) - return - - user.set_machine(src) - var/area/A = src.loc - var/d1 - var/dat - if(ishuman(user) || user.has_unlimited_silicon_privilege) - A = A.loc - - if (A.party) - d1 = text("No Party :(", src) - else - d1 = text("PARTY!!!", src) - dat = text("Party Button []", d1) - - else - A = A.loc - if (A.fire) - d1 = text("[]", src, stars("No Party :(")) - else - d1 = text("[]", src, stars("PARTY!!!")) - dat = text("[] []", stars("Party Button"), d1) - - var/datum/browser/popup = new(user, "firealarm", "Party Alarm") - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return /obj/machinery/firealarm/partyalarm/reset() if (stat & (NOPOWER|BROKEN)) @@ -317,3 +284,17 @@ for(var/area/RA in A.related) RA.partyalert() return + +/obj/machinery/firealarm/partyalarm/ui_data(mob/user) + var/list/data = list() + data["emagged"] = emagged + + if(src.z == ZLEVEL_STATION) + data["seclevel"] = get_security_level() + else + data["seclevel"] = "green" + + var/area/A = get_area(src) + data["alarm"] = A.party + + return data \ No newline at end of file From 304fdf8d1ac08d447316dcd275b45ac905318ee8 Mon Sep 17 00:00:00 2001 From: tortellinitony Date: Tue, 18 Jul 2017 22:54:05 -0400 Subject: [PATCH 2/2] Change ui data --- code/game/machinery/firealarm.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 23a08820eb0..0acdc5353cd 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -286,15 +286,6 @@ return /obj/machinery/firealarm/partyalarm/ui_data(mob/user) - var/list/data = list() - data["emagged"] = emagged - - if(src.z == ZLEVEL_STATION) - data["seclevel"] = get_security_level() - else - data["seclevel"] = "green" - + . = ..() var/area/A = get_area(src) - data["alarm"] = A.party - - return data \ No newline at end of file + .["alarm"] = A.party