diff --git a/baystation12.dme b/baystation12.dme index c667276b93..c1af0ea319 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -37,7 +37,6 @@ #include "code\_onclick\click.dm" #include "code\_onclick\cyborg.dm" #include "code\_onclick\drag_drop.dm" -#include "code\_onclick\eye.dm" #include "code\_onclick\item_attack.dm" #include "code\_onclick\observer.dm" #include "code\_onclick\other_mobs.dm" @@ -1255,9 +1254,6 @@ #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\drone.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm" -#include "code\modules\mob\living\simple_animal\narsie\login.dm" -#include "code\modules\mob\living\simple_animal\narsie\logout.dm" -#include "code\modules\mob\living\simple_animal\narsie\narsie.dm" #include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" diff --git a/code/_onclick/eye.dm b/code/_onclick/eye.dm deleted file mode 100644 index 1c3282f23b..0000000000 --- a/code/_onclick/eye.dm +++ /dev/null @@ -1,7 +0,0 @@ -/mob/living/simple_animal/shade/narsie/DblClickOn(var/atom/A, params) - if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked - build_click(src, client.buildmode, params, A) - return - - sanity_check_eye() - eyeobj.setLoc(A) diff --git a/code/modules/mob/freelook/mask/eye.dm b/code/modules/mob/freelook/mask/eye.dm index 9b211e3bce..a0a9960322 100644 --- a/code/modules/mob/freelook/mask/eye.dm +++ b/code/modules/mob/freelook/mask/eye.dm @@ -11,26 +11,3 @@ /mob/eye/maskEye/New() ..() visualnet = cultnet - -/mob/living/simple_animal/shade/narsie/New() - ..() - sanity_check_eye() - -/mob/living/simple_animal/shade/narsie/Del() - del(eyeobj) - ..() - -/mob/living/simple_animal/shade/narsie/verb/center_on_self() - set category = "Mask of Nar-Sie" - set name = "Center on Self" - - sanity_check_eye() - for(var/datum/chunk/c in eyeobj.visibleChunks) - c.remove(eyeobj) - eyeobj.setLoc(src) - -/mob/living/simple_animal/shade/narsie/proc/sanity_check_eye() - if(!eyeobj) - eyeobj = new /mob/eye/maskEye() - eyeobj.owner = src - eyeobj.setLoc(src) diff --git a/code/modules/mob/living/simple_animal/narsie/login.dm b/code/modules/mob/living/simple_animal/narsie/login.dm deleted file mode 100644 index ac6e9b014f..0000000000 --- a/code/modules/mob/living/simple_animal/narsie/login.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/living/simple_animal/shade/narsie/Login() - ..() - src.center_on_self() diff --git a/code/modules/mob/living/simple_animal/narsie/logout.dm b/code/modules/mob/living/simple_animal/narsie/logout.dm deleted file mode 100644 index 07dcf7812d..0000000000 --- a/code/modules/mob/living/simple_animal/narsie/logout.dm +++ /dev/null @@ -1,3 +0,0 @@ -/mob/living/simple_animal/shade/narsie/Logout() - ..() - src.center_on_self() diff --git a/code/modules/mob/living/simple_animal/narsie/narsie.dm b/code/modules/mob/living/simple_animal/narsie/narsie.dm deleted file mode 100644 index 2337bc35f3..0000000000 --- a/code/modules/mob/living/simple_animal/narsie/narsie.dm +++ /dev/null @@ -1,108 +0,0 @@ -/mob/living/simple_animal/shade/narsie - maxHealth = 9001 - health = 9001 - status_flags = GODMODE - layer = OBFUSCATION_LAYER + 0.1 - invisibility = INVISIBILITY_OBSERVER - see_invisible = SEE_INVISIBLE_CULT - - var/influence_max = 0 - var/influence_target = 0 - var/influence_current = 0 - var/last_influence_change = 0 - -/mob/living/simple_animal/shade/narsie/New() - ..() - src.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS - last_influence_change = world.time - - make_floating(1) - -/mob/living/simple_animal/shade/narsie/stop_floating() - -/mob/living/simple_animal/shade/narsie/say(var/message) - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/emote(var/act, var/type, var/desc) - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/visible_emote(var/act_desc) - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/audible_emote(var/act_desc) - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/attack_hand() - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/UnarmedAttack() - if(HasSufficientInfluenceFeedback()) - ..() - -/mob/living/simple_animal/shade/narsie/hear_say() - if(HasSufficientInfluence()) - ..() - -/mob/living/simple_animal/shade/narsie/hear_radio() - if(HasSufficientInfluence()) - ..() - -/mob/living/simple_animal/shade/narsie/proc/HasSufficientInfluenceFeedback() - . = HasSufficientInfluence() - if(!.) - src << "You do not yet have the influence to interact directly with the mortal realm." - -/mob/living/simple_animal/shade/narsie/proc/HasSufficientInfluence() - return invisibility <= SEE_INVISIBLE_LIVING - -/mob/living/simple_animal/shade/narsie/verb/TargetInfluence() - set category = "Mask of Nar-Sie" - set name = "Set Target Influence" - - var/influence = input("Set the target influence level", "Set influence", influence_target) as num|null - if(isnum(influence)) - influence_target = influence - -/mob/living/simple_animal/shade/narsie/verb/MaxInfluence() - set category = "Mask of Nar-Sie" - set name = "Set Max Influence" - - var/influence = input("Set the max influence level", "Set influence", influence_max) as num|null - if(isnum(influence)) - influence_max = influence - -/mob/living/simple_animal/shade/narsie/Life() - ..() - ProcessHUD() - ProcessInfluence() - -/mob/living/simple_animal/shade/narsie/OnDeathInLife() - -/mob/living/simple_animal/shade/narsie/proc/ProcessHUD() - if(client) - client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask, global_hud.nvg, global_hud.thermal, global_hud.meson, global_hud.science) - - client.screen |= global_hud.science - -/mob/living/simple_animal/shade/narsie/proc/ProcessInfluence() - var/ticks_since_last = world.time - last_influence_change - last_influence_change = world.time - - if(influence_target > influence_max) - influence_target = influence_max - - if(influence_current < influence_target) - influence_current += round(ticks_since_last/10,1) - - if(influence_current > influence_target) - influence_current = influence_target - -/mob/living/simple_animal/shade/narsie/Stat() - if(statpanel("Mask of Nar-Sie")) - stat(null, "Influence: [influence_current]/[influence_max]") - ..()