From 2365a8ba5ecd34ef194af21535cb2ab5edc749ef Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:06:37 +0100 Subject: [PATCH 01/11] Update to X Made it stand still longer after performing a hit. New icon. New non meme description Now can not be pulled while stationary what an absolute unit --- .../living/simple_animal/animals/tarrasque.dm | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 712a3e05e6..a1440b0ac0 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,9 +93,9 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mob/animal.dmi' - name = "X" - desc = "He's gonna give it to you." + icon = 'icons/mobs/64x64' + name = "Entity X" + desc = "The call of the abyss manifested." hasdrops = 0 health = 2000 maxHealth = 2000 @@ -104,10 +104,21 @@ melee_attack_maxDelay = 1 view_range = 420 size_multiplier = 1.5 - icon_living = "faithless" //possibly gonna give him a new sprite in the future - icon_dead = "faithless_dead" + icon_state = "arachnid" + icon_living = "arachnid" + icon_dead = "arachnid_dead" tt_desc = "Unknown Specimen" attacktext = list("whacks","punches","smashes") + melee_damage_lower = 0 //huh not so bad + melee_damage_upper = 50 //oh, oh no + armor = list( + "melee" = 99, + "bullet" = 99, + "laser" = 99, + "energy" = 99, + "bomb" = 99, + "bio" = 100, + "rad" = 100) //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) @@ -115,8 +126,10 @@ if(.) // If we succeeded in hitting. if(isliving(A)) var/mob/living/L = A - L.Weaken(10) + L.Weaken(5) stop_automated_movement = 1 - spawn(20) + anchored = 1 + spawn(100) stop_automated_movement = 0 + anchored = 0 From a2bb22bad61878467a7faac6275cca1acd90c720 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:36:13 +0100 Subject: [PATCH 02/11] Update tarrasque.dm --- .../mob/living/simple_animal/animals/tarrasque.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index a1440b0ac0..0aebd5f716 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -108,7 +108,7 @@ icon_living = "arachnid" icon_dead = "arachnid_dead" tt_desc = "Unknown Specimen" - attacktext = list("whacks","punches","smashes") + attacktext = list("whacks","slashes","smashes") melee_damage_lower = 0 //huh not so bad melee_damage_upper = 50 //oh, oh no armor = list( @@ -119,17 +119,27 @@ "bomb" = 99, "bio" = 100, "rad" = 100) + var/litaf = 0 + +/mob/living/simple_animal/hostile/tarrasque/mrx/Life() + ..() + if (litaf) + set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) + //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) . = ..() if(.) // If we succeeded in hitting. + for(var/obj/machinery/light/light in range(5, src)) + light.flicker(10) if(isliving(A)) var/mob/living/L = A L.Weaken(5) stop_automated_movement = 1 anchored = 1 + litaf = 1 spawn(100) stop_automated_movement = 0 anchored = 0 - + litaf = 0 From a02ede4b9324a3c06e874359e1fc97200ddea5aa Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:43:01 +0100 Subject: [PATCH 03/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 0aebd5f716..d8432eeb29 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -125,6 +125,8 @@ ..() if (litaf) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) + for(/obj/machinery/door/airlock/door in range(3, src)) + door.open() //time for special MR X kick you in the shins and stands there code @@ -132,7 +134,7 @@ . = ..() if(.) // If we succeeded in hitting. for(var/obj/machinery/light/light in range(5, src)) - light.flicker(10) + light.flicker(10) if(isliving(A)) var/mob/living/L = A L.Weaken(5) From e3fb06fdf4a257c341e60f951ec4e26e5f439013 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:47:05 +0100 Subject: [PATCH 04/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index d8432eeb29..86702a2cdd 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -119,11 +119,10 @@ "bomb" = 99, "bio" = 100, "rad" = 100) - var/litaf = 0 /mob/living/simple_animal/hostile/tarrasque/mrx/Life() ..() - if (litaf) + if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) door.open() @@ -140,8 +139,6 @@ L.Weaken(5) stop_automated_movement = 1 anchored = 1 - litaf = 1 spawn(100) stop_automated_movement = 0 anchored = 0 - litaf = 0 From 812b9f6c2c835852fd6fd09c2142536326579961 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:52:28 +0100 Subject: [PATCH 05/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 86702a2cdd..c51e758fe7 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -122,6 +122,8 @@ /mob/living/simple_animal/hostile/tarrasque/mrx/Life() ..() + if(resting) + resting = !resting if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) From 3d242b1424fbdee80cdb59b68e76eabb3705633f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:54:23 +0100 Subject: [PATCH 06/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index c51e758fe7..ca27d85247 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -128,7 +128,6 @@ set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) door.open() - //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From 81637b7d3ac9c19d49fbffd1ec5b823cd655ac48 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 04:56:38 +0100 Subject: [PATCH 07/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index ca27d85247..f6daa8208c 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -127,7 +127,7 @@ if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(/obj/machinery/door/airlock/door in range(3, src)) - door.open() + door.open() //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From bd063cc5bbbf3ef6c789c001584f6a5cc783715f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:36:02 +0100 Subject: [PATCH 08/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index f6daa8208c..39cba224ee 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,7 +93,7 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mobs/64x64' + icon = 'icons/mob/64x64' name = "Entity X" desc = "The call of the abyss manifested." hasdrops = 0 @@ -126,7 +126,7 @@ resting = !resting if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) - for(/obj/machinery/door/airlock/door in range(3, src)) + for(var/obj/machinery/door/airlock/door in range(3, src)) door.open() //time for special MR X kick you in the shins and stands there code From 9f397d4c7af9aa1a7f02455aaa4a001e3716dd6a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:46:34 +0100 Subject: [PATCH 09/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 39cba224ee..9b3cb13828 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -93,7 +93,7 @@ //MRX Variation /mob/living/simple_animal/hostile/tarrasque/mrx - icon = 'icons/mob/64x64' + icon = 'icons/mob/64x64.dmi' name = "Entity X" desc = "The call of the abyss manifested." hasdrops = 0 From daff2ad4cb46e17ecaabb5df06dc703306a7807f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:55:09 +0100 Subject: [PATCH 10/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 9b3cb13828..0bf6b2eac2 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -128,6 +128,8 @@ set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(var/obj/machinery/door/airlock/door in range(3, src)) door.open() + spawn(4) + door.lock() //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A) From 9c27987d8dee7cd596dff5ff616855c760589b73 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 05:58:22 +0100 Subject: [PATCH 11/11] Update tarrasque.dm --- code/modules/mob/living/simple_animal/animals/tarrasque.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/animals/tarrasque.dm b/code/modules/mob/living/simple_animal/animals/tarrasque.dm index 0bf6b2eac2..51be94b90c 100644 --- a/code/modules/mob/living/simple_animal/animals/tarrasque.dm +++ b/code/modules/mob/living/simple_animal/animals/tarrasque.dm @@ -95,7 +95,7 @@ /mob/living/simple_animal/hostile/tarrasque/mrx icon = 'icons/mob/64x64.dmi' name = "Entity X" - desc = "The call of the abyss manifested." + desc = "The call of the abyss manifested. Doors have proven inefective against it." hasdrops = 0 health = 2000 maxHealth = 2000 @@ -127,9 +127,8 @@ if (anchored) set_light(l_range = 1.5, l_power = 2, l_color = COLOR_RED) for(var/obj/machinery/door/airlock/door in range(3, src)) - door.open() - spawn(4) - door.lock() + door.open(1) + door.lock(1) //time for special MR X kick you in the shins and stands there code /mob/living/simple_animal/hostile/tarrasque/mrx/DoPunch(var/atom/A)