From 94e50ca22b72b4a9cdbdb1c97ac9dd89992211d1 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Thu, 20 Aug 2020 01:06:21 +0200 Subject: [PATCH 1/3] Fixes my stupid mistake --- _maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm | 7 +------ .../awaymissions/mission_code/ruins/wizardcrash.dm | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm index a063d88a252..3add952e8e2 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm @@ -152,12 +152,7 @@ /turf/simulated/floor/wood, /area/ruin/unpowered) "az" = ( -/obj/item/spellbook/oneuse/charge{ - desc = "For the technology-hating wizard."; - spell = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech; - spellname = "Disable Technology"; - used = 1 - }, +/obj/item/spellbook/oneuse/emp/used, /turf/simulated/floor/wood, /area/ruin/unpowered) "aA" = ( diff --git a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm index c5b56805213..d23b4e6c1c5 100644 --- a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm +++ b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm @@ -4,10 +4,16 @@ name = "Mission Briefing" info = "To the Magnificent Z.A.P.
A small mining base has been created within our territory by wandless scum. Send them a message from the wizard federation they will not forget. I know your kind is rather fragile, but a group of lightly armed miners should not pose any threat to you at all. Just be warned they have a security cyborg for self defence, you might want to tune your spells to that threat. I look forward to hearing of your success.
Grand Magus Abra the Wonderous" +/obj/item/spellbook/oneuse/emp/used + spell = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech + used = TRUE //spawns used + spellname = "Disable Technology" + icon_state = "bookcharge" //it's a lightning bolt, seems appropriate enough + desc = "For the magic-hating wizard on the go." /obj/effect/spawner/lootdrop/wizardcrash loot = list( - /obj/item/guardiancreator = 1, //jackpot. + /obj/item/guardiancreator = 1, //jackpot. /obj/item/spellbook/oneuse/knock = 1, //tresspassing charges incoming /obj/item/gun/magic/wand/resurrection = 1, //medbay's best friend /obj/item/spellbook/oneuse/charge = 20, //and now for less useful stuff to dilute the good loot chances From 1e895b374bafbc8d7438839ae15bc1f9f7749ba1 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Thu, 20 Aug 2020 01:12:46 +0200 Subject: [PATCH 2/3] derp in description --- .../awaymissions/mission_code/ruins/wizardcrash.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm index d23b4e6c1c5..e02c0ccb4c7 100644 --- a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm +++ b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm @@ -4,12 +4,14 @@ name = "Mission Briefing" info = "To the Magnificent Z.A.P.
A small mining base has been created within our territory by wandless scum. Send them a message from the wizard federation they will not forget. I know your kind is rather fragile, but a group of lightly armed miners should not pose any threat to you at all. Just be warned they have a security cyborg for self defence, you might want to tune your spells to that threat. I look forward to hearing of your success.
Grand Magus Abra the Wonderous" -/obj/item/spellbook/oneuse/emp/used +/obj/item/spellbook/oneuse/emp/ spell = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech - used = TRUE //spawns used spellname = "Disable Technology" icon_state = "bookcharge" //it's a lightning bolt, seems appropriate enough - desc = "For the magic-hating wizard on the go." + desc = "For the tech-hating wizard on the go." + +/obj/item/spellbook/oneuse/emp/used + used = TRUE //spawns used /obj/effect/spawner/lootdrop/wizardcrash loot = list( From 6b19caa08f1504ba88be5200d22dd99d2baaf529 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Thu, 20 Aug 2020 13:07:40 +0200 Subject: [PATCH 3/3] Now with one less slash --- code/modules/awaymissions/mission_code/ruins/wizardcrash.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm index e02c0ccb4c7..75fbbf698e6 100644 --- a/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm +++ b/code/modules/awaymissions/mission_code/ruins/wizardcrash.dm @@ -4,7 +4,7 @@ name = "Mission Briefing" info = "To the Magnificent Z.A.P.
A small mining base has been created within our territory by wandless scum. Send them a message from the wizard federation they will not forget. I know your kind is rather fragile, but a group of lightly armed miners should not pose any threat to you at all. Just be warned they have a security cyborg for self defence, you might want to tune your spells to that threat. I look forward to hearing of your success.
Grand Magus Abra the Wonderous" -/obj/item/spellbook/oneuse/emp/ +/obj/item/spellbook/oneuse/emp spell = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech spellname = "Disable Technology" icon_state = "bookcharge" //it's a lightning bolt, seems appropriate enough