Thought I had done these before, turned out I did. Single-linebreak conflicts woo.

This commit is contained in:
Zuhayr
2014-10-12 11:55:33 +10:30
13 changed files with 33 additions and 19 deletions

View File

@@ -88,7 +88,7 @@
//Pass the attack on to the target. This might delete/relocate wrapped.
target.attackby(wrapped,user)
//If wrapped did neither get deleted nor put into target, put it back into the gripper.
//If wrapped was neither deleted nor put into target, put it back into the gripper.
if(wrapped && user && (wrapped.loc == user))
wrapped.loc = src
else

View File

@@ -862,6 +862,7 @@ var/list/robot_verbs_default = list(
return ..()
/mob/living/silicon/robot/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."

View File

@@ -266,6 +266,7 @@
return
/mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."

View File

@@ -45,4 +45,4 @@
client.eye = src
client.perspective = MOB_PERSPECTIVE
nanomanager.send_resources(client)
nanomanager.send_resources(client)