From 6f6bd244d25c1d8649fe690c14cb3ccc4b919767 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 23 Dec 2015 12:26:14 +0100 Subject: [PATCH 1/2] Fixes statues pointing when visible --- code/modules/mob/living/simple_animal/hostile/statue.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 334fb15e237..577fc2a6859 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -219,4 +219,10 @@ /mob/living/simple_animal/hostile/statue/sentience_act() - faction -= "neutral" \ No newline at end of file + faction -= "neutral" + +/mob/proc/restrained() + . == ..() + if(can_be_seen(loc)) + return 1 + return . \ No newline at end of file From 503a8a3557b135707b2c746e7bb5a6f023a36838 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 23 Dec 2015 12:18:26 +0100 Subject: [PATCH 2/2] Fixes SQDL2 paren escaping --- code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm | 2 +- code/modules/mob/living/simple_animal/hostile/statue.dm | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 520a83b25b6..3dbe45235a5 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -396,7 +396,7 @@ string(i, list/node) if(copytext(token(i), 1, 2) in list("'", "\"")) - node += token(i) + node += copytext(token(i),2,-1) else parse_error("Expected string but found '[token(i)]'") diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 577fc2a6859..d26707238bf 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -221,8 +221,7 @@ /mob/living/simple_animal/hostile/statue/sentience_act() faction -= "neutral" -/mob/proc/restrained() +/mob/living/simple_animal/hostile/statue/restrained() . == ..() if(can_be_seen(loc)) - return 1 - return . \ No newline at end of file + return 1 \ No newline at end of file