Skip to content

Commit

Permalink
Revert and fix for e-nets.
Browse files Browse the repository at this point in the history
  • Loading branch information
NullSnapshot committed Jul 25, 2014
1 parent 2c7bb6c commit ec238be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
16 changes: 7 additions & 9 deletions code/game/gamemodes/events/ninja_equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 <b>SUCCESS</b>: \black transport procedure of \the [affecting] complete."
if(!isnull(master))//As long as they still exist.
master << "\blue <b>SUCCESS</b>: \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!"
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/events/space_ninja.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ec238be

Please sign in to comment.