Fixes some issues and closes others; nerfs abductor emergency teleporter (#24690)

* Fixes Wish Granter resurrection spam

* Fixes box icons

* Emergency teleporter nerf
This commit is contained in:
Xhuis
2017-03-06 06:20:55 -05:00
committed by AnturK
parent 04e445cbfe
commit 86488d18d3
6 changed files with 29 additions and 10 deletions

View File

@@ -18,6 +18,8 @@
#define STATUS_EFFECT_HISGRACE /datum/status_effect/his_grace //His Grace.
#define STATUS_EFFECT_WISH_GRANTERS_GIFT /datum/status_effect/wish_granters_gift //If you're currently resurrecting with the Wish Granter
/////////////
// DEBUFFS //
/////////////

View File

@@ -201,3 +201,21 @@
if(islist(owner.stun_absorption) && owner.stun_absorption["hisgrace"])
owner.stun_absorption -= "hisgrace"
/datum/status_effect/wish_granters_gift //Fully revives after ten seconds.
id = "wish_granters_gift"
duration = 50
alert_type = /obj/screen/alert/status_effect/wish_granters_gift
/datum/status_effect/wish_granters_gift/on_apply()
owner << "<span class='notice'>Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...</span>"
/datum/status_effect/wish_granters_gift/on_remove()
owner.revive(full_heal = 1, admin_revive = 1)
owner.visible_message("<span class='warning'>[owner] appears to wake from the dead, having healed all wounds!</span>", "<span class='notice'>You have regenerated.</span>")
owner.update_canmove()
/obj/screen/alert/status_effect/wish_granters_gift
name = "Wish Granter's Immortality"
desc = "You are being resurrected!"
icon_state = "wish_granter"

View File

@@ -17,6 +17,8 @@
for(var/mob/living/target in loc)
target.forceMove(teleport_target)
new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir)
target << "<span class='warning'>The instability of the warp leaves you disoriented!</span>"
target.Stun(3)
/obj/machinery/abductor/pad/proc/Retrieve(mob/living/target)
flick("alien-pad", src)

View File

@@ -147,7 +147,7 @@
/obj/item/weapon/storage/box/masks
name = "box of sterile masks"
desc = "This box contains sterile medical masks."
icon_state = "sterile"
illustration = "sterile"
/obj/item/weapon/storage/box/masks/New()
..()
@@ -762,7 +762,7 @@
/obj/item/weapon/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
icon_state = "donk_kit"
illustration = "donk_kit"
item_state = null
/obj/item/weapon/storage/box/ingredients/wildcard

View File

@@ -120,11 +120,8 @@
if(!C.stat)
C << "<span class='notice'>You're not dead yet!</span>"
return
C << "<span class='notice'>Death is not your end!</span>"
spawn(rand(80,120))
C.revive(full_heal = 1, admin_revive = 1)
C << "<span class='notice'>You have regenerated.</span>"
C.visible_message("<span class='warning'>[usr] appears to wake from the dead, having healed all wounds.</span>")
C.update_canmove()
return 1
if(C.has_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT))
C << "<span class='warning'>You're already resurrecting!</span>"
return
C.apply_status_effect(STATUS_EFFECT_WISH_GRANTERS_GIFT)
return 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 81 KiB