From 7a87ee111fd6e51d3a34d5e604ecf9c14330f9aa Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 28 Feb 2014 19:09:24 -0500 Subject: [PATCH] Compile fixes --- code/game/dna/genes/goon_powers.dm | 2 +- .../items/weapons/implants/implanter.dm | 33 ++++++------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 6993e90e6f7..727b59c9e6b 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -130,7 +130,7 @@ range = 7 selection_type = "range" include_user = 1 - centcomm_cancast = 0 +// centcomm_cancast = 0 var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey) /obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index dfe2fc80acd..873c1e375b0 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -46,12 +46,12 @@ var/datum/organ/external/affected = H.get_organ(user.zone_sel.selecting) affected.implants += src.imp imp.part = affected - M:implanting = 0 src.imp = null update() return + /obj/item/weapon/implanter/traitor name = "implanter-greytide" desc = "Greytide Stationwide." @@ -95,6 +95,10 @@ name = "implanter (C)" icon_state = "cimplanter1" + var/list/forbidden_types=list( + // /obj/item/weapon/storage/bible // VG #11 - Recursion. + ) + /obj/item/weapon/implanter/compressed/New() imp = new /obj/item/weapon/implant/compressed( src ) ..() @@ -123,8 +127,11 @@ return ..() -/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob) - if(istype(A,/obj/item) && imp) +/obj/item/weapon/implanter/compressed/afterattack(var/obj/item/I, mob/user as mob) + if(is_type_in_list(I,forbidden_types)) + user << "\red A red light flickers on the implanter." + return + if(istype(I) && imp) var/obj/item/weapon/implant/compressed/c = imp if (c.scanned) user << "\red Something is already scanned inside the implant!" @@ -134,24 +141,4 @@ user.update_icons() //update our overlays c.scanned = I c.scanned.loc = c - - -/obj/item/weapon/implanter/deadman - name = "implanter-deadman" - desc = "Switch it." - - New() - src.imp = new /obj/item/weapon/implant/deadman(src) - ..() update() - return - -/obj/item/weapon/implanter/death_alarm - name = "implanter-death alarm" - desc = "Announces the death of the implanted person over radio" - - New() - src.imp = new /obj/item/weapon/implant/death_alarm(src) - ..() - update() - return