From 6fb913bab8ddd3ad8c29b2a55f8fabdc7d1d38fa Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 09:18:23 +0100 Subject: [PATCH 1/9] SMES mimics Additionally wrote a proc to properly handle size changing for these grubs specifically expand_size() following the naming scheme of expand_grub() expand_dong() soon to come! ~~not really~~ --- .../simple_animal/vore/solargrub_subtype.dm | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm new file mode 100644 index 0000000000..65a49d2adb --- /dev/null +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -0,0 +1,30 @@ +//What belongs here? all non grubs that reuse grub code, Let's start off with grub like SMES mimics + +/mob/living/simple_animal/retaliate/solargrub/smes + name = "juvenile SMESgrub" + desc = "A young sparkling SMESgrub" + icon = 'icons/obj/power.dmi' + icon_state = "smes" + icon_living = "smes" + icon_dead = "smes" + +/mob/living/simple_animal/retaliate/solargrub/smes/big + name = "Greater SMESgrub" + desc = "A big sparkling SMESgrub" + icon = 'icons/obj/power.dmi' + icon_state = "smes" + icon_living = "smes" + icon_dead = "smes" + +/mob/living/simple_animal/retaliate/solargrub/smes/big/New() + expand_size(2) + +/mob/living/simple_animal/retaliate/solargrub/smes/proc/expand_size(var/size=null) + size_multiplier = size + update_icons() + +/mob/living/simple_animal/retaliate/solargrub/smes/death() + ..() + var/location = get_turf(src) + new /obj/machinery/power/smes(location) + qdel(src) From 9489bb1f1411bb159fccea7096d7c968d9fe0e99 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 09:28:51 +0100 Subject: [PATCH 2/9] Compilation include #include "code\modules\mob\living\simple_animal\vore\solargrub_subtype.dm" --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 3ff0c8b37f..c2a659d42b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2262,6 +2262,7 @@ #include "code\modules\mob\living\simple_animal\vore\snake.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub.dm" #include "code\modules\mob\living\simple_animal\vore\solargrub_larva.dm" +#include "code\modules\mob\living\simple_animal\vore\solargrub_subtype.dm" #include "code\modules\mob\living\simple_animal\vore\wolf.dm" #include "code\modules\mob\living\simple_animal\vore\zz_vore_overrides.dm" #include "code\modules\mob\living\simple_animal\vore\shadekin\_defines.dm" From de64c1d4507740578d56efb24c7708c927feb1ae Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 09:37:25 +0100 Subject: [PATCH 3/9] Update solargrub_subtype.dm --- code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index 65a49d2adb..c4d90a881a 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -25,6 +25,5 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - var/location = get_turf(src) new /obj/machinery/power/smes(location) qdel(src) From 1b2dca6f90284fd1fbd33281895c0c73bc23f090 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 09:41:24 +0100 Subject: [PATCH 4/9] Update solargrub_subtype.dm --- code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index c4d90a881a..17331543d2 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -25,5 +25,5 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - new /obj/machinery/power/smes(location) + new /obj/machinery/power/smes/buildable/SMES(location) qdel(src) From 409cc67482950500babee0efbfa372c4db71cea4 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:01:58 +0100 Subject: [PATCH 5/9] Update solargrub_subtype.dm --- code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index 17331543d2..6b53c15e0b 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -25,5 +25,5 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - new /obj/machinery/power/smes/buildable/SMES(location) + new /obj/machinery/power/smes/buildable(location) qdel(src) From e2665c92d7ea12eca94c1e3a1cc64eefb02dcf4f Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 4 Mar 2019 10:12:47 +0100 Subject: [PATCH 6/9] Update solargrub_subtype.dm --- .../mob/living/simple_animal/vore/solargrub_subtype.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index 6b53c15e0b..ac948d840d 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -23,7 +23,14 @@ size_multiplier = size update_icons() +/obj/machinery/power/smes/buildable/outpost_substation/grub/New() + ..(0) + component_parts += new /obj/item/weapon/smes_coil/weak(src) + RCon_tag = "Unidentified_Power_Storage" + recalc_coils() + charge = 600000 //Let's do this after recalc to avoid overload issues + /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - new /obj/machinery/power/smes/buildable(location) + new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) qdel(src) From 62611ed2217fac5787b470d1d106c983ab128065 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 02:38:44 +0100 Subject: [PATCH 7/9] Update solargrub_subtype.dm --- .../modules/mob/living/simple_animal/vore/solargrub_subtype.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index ac948d840d..06b448922d 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -32,5 +32,6 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) + var//obj/machinery/power/drop = new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) + drop.charge = charge qdel(src) From fe52621595758dd151aee2bb894823bc6d6a221a Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 02:39:27 +0100 Subject: [PATCH 8/9] Update solargrub_subtype.dm --- code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index 06b448922d..793afe1e74 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -32,6 +32,6 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - var//obj/machinery/power/drop = new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) + var/obj/machinery/power/drop = new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) drop.charge = charge qdel(src) From b346a49fd4fa9748c4cd2f477a437e2125dca479 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Tue, 5 Mar 2019 02:55:11 +0100 Subject: [PATCH 9/9] Update solargrub_subtype.dm --- .../mob/living/simple_animal/vore/solargrub_subtype.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm index 793afe1e74..ccdeb15fd7 100644 --- a/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm +++ b/code/modules/mob/living/simple_animal/vore/solargrub_subtype.dm @@ -32,6 +32,6 @@ /mob/living/simple_animal/retaliate/solargrub/smes/death() ..() - var/obj/machinery/power/drop = new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) - drop.charge = charge + /*var/obj/machinery/power/drop = */new /obj/machinery/power/smes/buildable/outpost_substation/grub(location) + //drop.charge = charge //Solargrubs dont fucking keep track of charge wtf qdel(src)