From 1d3e9e38bc79101b501708989a5e88859d3c0146 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Fri, 29 Nov 2019 00:58:04 -0500 Subject: [PATCH 1/6] removes powergame fuck you sishen --- code/modules/vending/cola.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index a242d88be4..1548d86fb7 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -10,7 +10,6 @@ /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, @@ -62,12 +61,6 @@ /obj/machinery/vending/cola/sodie icon_state = "soda" -/obj/machinery/vending/cola/pwr_game - icon_state = "pwr_game" - name = "\improper Pwr Game Vendor" - desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads." - product_slogans = "The POWER that gamers crave! PWR GAME!" - /obj/machinery/vending/cola/shamblers name = "\improper Shambler's Vendor" desc = "~Shake me up some of that Shambler's Juice!~" From d297eba68e7e7122b170640e72494871b034f88f Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Wed, 11 Dec 2019 22:26:04 -0500 Subject: [PATCH 2/6] Revert "removes powergame" This reverts commit 1d3e9e38bc79101b501708989a5e88859d3c0146. --- code/modules/vending/cola.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 1548d86fb7..a242d88be4 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -10,6 +10,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, @@ -61,6 +62,12 @@ /obj/machinery/vending/cola/sodie icon_state = "soda" +/obj/machinery/vending/cola/pwr_game + icon_state = "pwr_game" + name = "\improper Pwr Game Vendor" + desc = "You want it, we got it. Brought to you in partnership with Vlad's Salads." + product_slogans = "The POWER that gamers crave! PWR GAME!" + /obj/machinery/vending/cola/shamblers name = "\improper Shambler's Vendor" desc = "~Shake me up some of that Shambler's Juice!~" From 93c4d3c1afd29ed882de58029752a2410636fc6a Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Thu, 12 Dec 2019 23:27:12 -0500 Subject: [PATCH 3/6] martial artists --- code/__DEFINES/antagonists.dm | 1 + code/modules/antagonists/_common/antag_spawner.dm | 2 ++ code/modules/antagonists/wizard/wizard.dm | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index b2f05fd5f8..4f174782ae 100644 --- a/code/__DEFINES/antagonists.dm +++ b/code/__DEFINES/antagonists.dm @@ -12,6 +12,7 @@ #define APPRENTICE_BLUESPACE "bluespace" #define APPRENTICE_ROBELESS "robeless" #define APPRENTICE_HEALING "healing" +#define APPRENTICE_MARTIAL "martial" //ERT Types diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 3723b99f4e..14b1527b3d 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -37,6 +37,8 @@ dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
" dat += "Robeless
" dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
" + dat += "Martial Artist
" + dat += "Your apprentice is training in ancient martial arts. They know the Plasmafist and Lesser Heal.
" user << browse(dat, "window=radio") onclose(user, "radio") return diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 9b2532c71b..0b9613ea5c 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -177,6 +177,10 @@ owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") + if(APPRENTICE_MARTIAL) + owner.AddSpell(new /obj/effect/proc_holder/spell/self/basic_heal(null)) + H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H)) + to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are able to cast a flesh mending spell.") /datum/antagonist/wizard/apprentice/create_objectives() var/datum/objective/protect/new_objective = new /datum/objective/protect From b6c9c733726cac949804e2aa412c1cea193d33cd Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 15 Dec 2019 23:28:17 -0500 Subject: [PATCH 4/6] this cannot go wrong --- code/modules/antagonists/wizard/wizard.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 0b9613ea5c..64bfd951f2 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -178,7 +178,7 @@ owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") if(APPRENTICE_MARTIAL) - owner.AddSpell(new /obj/effect/proc_holder/spell/self/basic_heal(null)) + owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist(null)) H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H)) to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are able to cast a flesh mending spell.") From 9f719000524f49c8d61e76e49befd706d498f0f4 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Sun, 15 Dec 2019 23:29:01 -0500 Subject: [PATCH 5/6] oop --- code/modules/antagonists/wizard/wizard.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 64bfd951f2..a88eb1e42a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -180,7 +180,7 @@ if(APPRENTICE_MARTIAL) owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist(null)) H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H)) - to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are able to cast a flesh mending spell.") + to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are also able to use the Nuclear Fist at will.") /datum/antagonist/wizard/apprentice/create_objectives() var/datum/objective/protect/new_objective = new /datum/objective/protect From 8da0ddda1bfa799b86fbbe5469799f665cc30fac Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Tue, 17 Dec 2019 16:40:06 -0500 Subject: [PATCH 6/6] oops --- code/modules/antagonists/_common/antag_spawner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 14b1527b3d..c8fbfde4d2 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -38,7 +38,7 @@ dat += "Robeless
" dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
" dat += "Martial Artist
" - dat += "Your apprentice is training in ancient martial arts. They know the Plasmafist and Lesser Heal.
" + dat += "Your apprentice is training in ancient martial arts. They know the Plasmafist and Nuclear Fist.
" user << browse(dat, "window=radio") onclose(user, "radio") return