things with stuff (#6233)
* buncha things from upstream * datums globals, onclick * datums * game folder, holy shit mirror bot why * modules * icons * dme * compiles cleanly * tools purge * updates maps * double check just because. and wew lad * incidentally, this needs more work first * some things * weh * sound cleanup and icons * reeeee * compile issues * oh look, fresh code sync * cleans up some unused icons * dirty vars * reeeeeeeeeeeeeeee * wew lad. fuck off with this already
This commit is contained in:
@@ -84,11 +84,13 @@
|
||||
else
|
||||
return QDEL_HINT_LETMELIVE
|
||||
|
||||
//ATTACK HAND IGNORING PARENT RETURN VALUE
|
||||
/obj/structure/necropolis_gate/attack_hand(mob/user)
|
||||
if(locked)
|
||||
to_chat(user, "<span class='boldannounce'>It's [open ? "stuck open":"locked"].</span>")
|
||||
return
|
||||
toggle_the_gate(user)
|
||||
return ..()
|
||||
|
||||
/obj/structure/necropolis_gate/proc/toggle_the_gate(mob/user, legion_damaged)
|
||||
if(changing_openness)
|
||||
@@ -151,6 +153,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
|
||||
else
|
||||
return QDEL_HINT_LETMELIVE
|
||||
|
||||
//ATTACK HAND IGNORING PARENT RETURN VALUE
|
||||
/obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user)
|
||||
if(!open && !changing_openness)
|
||||
var/safety = alert(user, "You think this might be a bad idea...", "Knock on the door?", "Proceed", "Abort")
|
||||
@@ -159,7 +162,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
|
||||
user.visible_message("<span class='warning'>[user] knocks on [src]...</span>", "<span class='boldannounce'>You tentatively knock on [src]...</span>")
|
||||
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, 1)
|
||||
sleep(50)
|
||||
..()
|
||||
return ..()
|
||||
|
||||
/obj/structure/necropolis_gate/legion_gate/toggle_the_gate(mob/user, legion_damaged)
|
||||
if(open)
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
density = TRUE
|
||||
var/win_prob = 5
|
||||
|
||||
/obj/structure/cursed_slot_machine/attack_hand(mob/living/carbon/human/user)
|
||||
/obj/structure/cursed_slot_machine/interact(mob/living/carbon/human/user)
|
||||
if(!istype(user))
|
||||
return
|
||||
if(obj_flags & IN_USE)
|
||||
@@ -58,6 +58,9 @@
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/cursed_money/attack_hand(mob/living/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
user.visible_message("<span class='warning'>[user] opens the bag and \
|
||||
and removes a die. The bag then vanishes.</span>",
|
||||
"<span class='boldwarning'>You open the bag...!</span>\n\
|
||||
|
||||
Reference in New Issue
Block a user