From ab820dfb7132039aa29a28be4a3263df7d39427e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 25 Jun 2015 20:10:42 -0400 Subject: [PATCH] Fixes based on TG pull fixes as per https://github.com/tgstation/-tg-station/pull/10151/ Also spread the one per limit to the Scrying orb, Can remove or add to other items as suggested/needed by feedback. --- code/game/gamemodes/wizard/spellbook.dm | 14 ++++++++++++++ .../living/simple_animal/slaughter/slaughter.dm | 1 + 2 files changed, 15 insertions(+) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 77ea5c6c066..60d082881e5 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -248,12 +248,22 @@ desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision." item_path = /obj/item/weapon/scrying log_name = "SO" + var/limit = 0 /datum/spellbook_entry/item/bloodbottle name = "Bottle of Blood" desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim." item_path = /obj/item/weapon/antag_spawner/slaughter_demon log_name = "BB" + var/limit = 0 + +/datum/spellbook_entry/item/bloodbottle/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + if(..()) + limit = 1 + return 1 + +/datum/spellbook_entry/item/bloodbottle/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + return ..() && !limit /datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) if(..()) @@ -263,8 +273,12 @@ user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO user << "\blue The walls suddenly disappear." + limit = 1 return 1 +/datum/spellbook_entry/item/scryingorb/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) + return ..() && !limit + /datum/spellbook_entry/item/soulstones name = "Six Soul Stone Shards and the spell Artificer" desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm index 1932187e856..cf474f5bd6b 100644 --- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm +++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm @@ -20,6 +20,7 @@ response_harm = "punches" icon = 'icons/mob/mob.dmi' icon_state = "daemon" + icon_living = "daemon" speed = 0 a_intent = "harm" stop_automated_movement = 1