Merge pull request #6124 from Citadel-Station-13/upstream-merge-36720

[MIRROR] Adds sanity check so you don't accidentally pop a fun balloon multiple times
This commit is contained in:
deathride58
2018-03-27 17:49:13 +00:00
committed by GitHub
+5 -4
View File
@@ -34,10 +34,11 @@
/obj/effect/fun_balloon/attack_ghost(mob/user)
if(!user.client || !user.client.holder || popped)
return
switch(alert("Pop [src]?","Fun Balloon","Yes","No"))
if("Yes")
effect()
pop()
var/confirmation = alert("Pop [src]?","Fun Balloon","Yes","No")
if(confirmation == "Yes" && !popped)
popped = TRUE
effect()
pop()
/obj/effect/fun_balloon/sentience
name = "sentience fun balloon"