From ec238be981c610296c2d708a36dc45dba55d13fd Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 25 Jul 2014 16:23:26 -0700 Subject: [PATCH] Revert and fix for e-nets. --- code/game/gamemodes/events/ninja_equipment.dm | 16 +++++++--------- code/game/gamemodes/events/space_ninja.dm | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index 2a7d35b4a5c..f6e4a985c0d 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1377,19 +1377,17 @@ It is possible to destroy the net by the occupant or someone else. playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1) anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir) del(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0). - else - M.loc = null - M << "\red You appear in a strange place!" + M << "\red You appear in a strange place!" - for(var/mob/O in viewers(src, 3)) - O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) + for(var/mob/O in viewers(src, 3)) + O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2) - if(!isnull(master))//As long as they still exist. - master << "\blue SUCCESS: \black transport procedure of \the [affecting] complete." + if(!isnull(master))//As long as they still exist. + master << "\blue SUCCESS: \black transport procedure of \the [affecting] complete." - M.captured = 0 //Important. - M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc. + M.captured = 0 //Important. + M.anchored = initial(M.anchored) //Changes the mob's anchored status to the original one; this is not handled by the can_move proc. else//And they are free. M << "\blue You are free of the net!" diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index cec5fe2e01f..03d9c6a8cd1 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -671,7 +671,7 @@ As such, it's hard-coded for now. No reason for it not to be, really. verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjapulse verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjablade verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjastar - //verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet + verbs += /obj/item/clothing/suit/space/space_ninja/proc/ninjanet s_initialized=1 slowdown=0