From 2035a338ffb9f430203798380956db672cd0e608 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 14 Jun 2018 15:33:34 -0700 Subject: [PATCH 1/4] Update magicarp.dm --- code/modules/events/wizard/magicarp.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index ab23c30e00..e0fd30aaaa 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -36,6 +36,7 @@ projectilesound = 'sound/weapons/emitter.ogg' maxHealth = 50 health = 50 + gold_core_spawnable = NO_SPAWN var/allowed_projectile_types = list(/obj/item/projectile/magic/change, /obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection, /obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) From a9100a89a62a6c6d2d2dc0b686e710fb77032a17 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 14 Jun 2018 15:35:25 -0700 Subject: [PATCH 2/4] modularize --- modular_citadel/code/modules/events/wizard/magicarp.dm | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 modular_citadel/code/modules/events/wizard/magicarp.dm diff --git a/modular_citadel/code/modules/events/wizard/magicarp.dm b/modular_citadel/code/modules/events/wizard/magicarp.dm new file mode 100644 index 0000000000..10d269c698 --- /dev/null +++ b/modular_citadel/code/modules/events/wizard/magicarp.dm @@ -0,0 +1,2 @@ +/mob/living/simple_animal/hostile/carp/ranged + gold_core_spawnable = NO_SPAWN From 7567590d0e209d1713f0f9f9c184428d9349935e Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 14 Jun 2018 15:35:46 -0700 Subject: [PATCH 3/4] Update magicarp.dm --- code/modules/events/wizard/magicarp.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index e0fd30aaaa..ab23c30e00 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -36,7 +36,6 @@ projectilesound = 'sound/weapons/emitter.ogg' maxHealth = 50 health = 50 - gold_core_spawnable = NO_SPAWN var/allowed_projectile_types = list(/obj/item/projectile/magic/change, /obj/item/projectile/magic/animate, /obj/item/projectile/magic/resurrection, /obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) From 46c2eebb94f24aa425fe16b058f591b4fa1d9808 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 17 Jun 2018 12:55:29 -0700 Subject: [PATCH 4/4] Update tgstation.dme --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 527db71b8c..47c6cbdd43 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2786,6 +2786,7 @@ #include "modular_citadel\code\modules\custom_loadout\load_to_mob.dm" #include "modular_citadel\code\modules\custom_loadout\read_from_file.dm" #include "modular_citadel\code\modules\events\blob.dm" +#include "modular_citadel\code\modules\events\wizard\magicarp.dm" #include "modular_citadel\code\modules\food_and_drinks\snacks\meat.dm" #include "modular_citadel\code\modules\jobs\jobs.dm" #include "modular_citadel\code\modules\jobs\job_types\captain.dm"