From 9442a2905e8466cadfdae54e40cfa886f5ecd357 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 29 Mar 2018 02:35:26 -0700
Subject: [PATCH] Fixes blueprints exploit (#36625)
* Fixes blueprints exploit
* redundent qdeleted
---
code/game/objects/items/blueprints.dm | 16 +++++++++++++---
code/modules/ruins/objects_and_mobs/sin_ruins.dm | 8 +++-----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index ad616e8ad3..9edd19795c 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -9,6 +9,7 @@
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
var/fluffnotice = "Nobody's gonna read this stuff!"
+ var/in_use = FALSE
/obj/item/areaeditor/attack_self(mob/user)
add_fingerprint(user)
@@ -25,12 +26,16 @@
/obj/item/areaeditor/Topic(href, href_list)
if(..())
- return
+ return TRUE
if(!usr.canUseTopic(src))
usr << browse(null, "window=blueprints")
- return
+ return TRUE
if(href_list["create_area"])
+ if(in_use)
+ return
+ in_use = TRUE
create_area(usr)
+ in_use = FALSE
updateUsrDialog()
//Station blueprints!!!
@@ -79,11 +84,16 @@
/obj/item/areaeditor/blueprints/Topic(href, href_list)
- ..()
+ if(..())
+ return
if(href_list["edit_area"])
if(get_area_type()!=AREA_STATION)
return
+ if(in_use)
+ return
+ in_use = TRUE
edit_area()
+ in_use = FALSE
if(href_list["exit_legend"])
legend = FALSE;
if(href_list["view_legend"])
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index 384f22282b..5bcc58ff87 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -82,15 +82,13 @@
var/mob/living/carbon/human/H = mover
if(H.nutrition >= NUTRITION_LEVEL_FAT)
H.visible_message("[H] pushes through [src]!", "You've seen and eaten worse than this.")
- return 1
+ return TRUE
else
to_chat(H, "You're repulsed by even looking at [src]. Only a pig could force themselves to go through it.")
if(istype(mover, /mob/living/simple_animal/hostile/morph))
- return 1
+ return TRUE
else
- return 0
-
-
+ return FALSE
/obj/structure/mirror/magic/pride //Pride's mirror: Used in the Pride ruin.
name = "pride's mirror"