From 54c28b19af50acb365bc04ba7884af8cb67416cf Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Wed, 10 Jul 2019 02:29:42 -0400 Subject: [PATCH 1/8] Zelus indeed --- code/game/gamemodes/clock_cult/clock_cult.dm | 6 ++- .../items/stacks/sheets/sheet_types.dm | 4 +- .../clockcult/clock_items/clockwork_armor.dm | 2 +- .../food_and_drinks/drinks/drinks/bottle.dm | 13 +++++ .../chemistry/reagents/other_reagents.dm | 45 +++++++++++++++++- icons/obj/drinks.dmi | Bin 85124 -> 85302 bytes 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index a24d846f15..0216abb3f9 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -275,7 +275,7 @@ Credit where due: gloves = /obj/item/clothing/gloves/color/yellow belt = /obj/item/storage/belt/utility/servant backpack_contents = list(/obj/item/storage/box/engineer = 1, \ - /obj/item/clockwork/replica_fabricator = 1, /obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1) + /obj/item/clockwork/replica_fabricator = 1, /obj/item/stack/tile/brass/fifty = 1, /obj/item/paper/servant_primer = 1, /obj/item/reagent_containers/food/drinks/holyoil = 1) id = /obj/item/pda var/plasmaman //We use this to determine if we should activate internals in post_equip() @@ -338,6 +338,10 @@ Credit where due: CLOCKCULTCHANGELOG\ \
\ +
  • Brass Flasks: These contain 30u of Zelus oil, this oil can be used to help stun people, and more son on Blood Cult\ + It can also be used to splash onto metal to make brass. Grinding bass will give you some oil back as well.\ + You can make more brass flasks to be used as throwing weaponds if you so wish, these will not have any oil in them. They have one throw before braking making them rather useless.\ + Lastly the oil can be drank for a bost in combat, gives you stamina as well as heals quickly!\ Good luck!" /obj/item/paper/servant_primer/Initialize() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b17bc87ffd..e1ecf6d14d 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -424,6 +424,8 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ new/datum/stack_recipe("receiver - brass skewer", /obj/structure/destructible/clockwork/trap/brass_skewer, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_ADJACENT), \ new/datum/stack_recipe("receiver - steam vent", /obj/structure/destructible/clockwork/trap/steam_vent, 3, time = 30, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \ new/datum/stack_recipe("receiver - power nullifier", /obj/structure/destructible/clockwork/trap/power_nullifier, 5, time = 20, one_per_turf = TRUE, on_floor = TRUE, placement_checks = STACK_CHECK_CARDINALS), \ + null, + new/datum/stack_recipe("brass flask", /obj/item/reagent_containers/food/drinks/holyoil/null), \ )) @@ -441,7 +443,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ throw_range = 3 turf_type = /turf/open/floor/clockwork novariants = FALSE - grind_results = list("iron" = 5, "teslium" = 15) + grind_results = list("iron" = 5, "teslium" = 15, "holyoil" = 1) merge_type = /obj/item/stack/tile/brass /obj/item/stack/tile/brass/narsie_act() diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm index 277aeca48d..4956a756e9 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm @@ -69,7 +69,7 @@ heat_protection = CHEST|GROIN|LEGS resistance_flags = FIRE_PROOF | ACID_PROOF armor = list("melee" = 60, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) - allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel) + allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel, /obj/item/reagent_containers/food/drinks/holyoil) /obj/item/clothing/suit/armor/clockwork/Initialize() . = ..() diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index a2a1c6d03f..d101375381 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -202,6 +202,19 @@ desc = "A flask of holy water...it's been sitting in the Necropolis a while though." list_reagents = list("hell_water" = 100) +/obj/item/reagent_containers/food/drinks/holyoil + name = "flask of zelus oil" + desc = "A brass flask of the zelus oil." + icon_state = "zelusflask" + list_reagents = list("holyoil" = 30) //Powerfull + volume = 30 + foodtype = NONE + force = 12 //Same as a toolbox + throwforce = 18 + +/obj/item/reagent_containers/food/drinks/holyoil/null + list_reagents = list("holyoil" = 0) + /obj/item/reagent_containers/food/drinks/bottle/vermouth name = "Goldeneye vermouth" desc = "Sweet, sweet dryness~" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 890403691e..88e7e82535 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -206,7 +206,12 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(is_servant_of_ratvar(M)) - to_chat(M, "A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!") + to_chat(M, "A fog spreads through your mind, purging the Justiciar's influence!") + ..() + +/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) + if(iscultist(M)) + to_chat(M, "A bright light cleans your mind of the darkness of corruption!") ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) @@ -309,6 +314,44 @@ M.adjustBrainLoss(5, 150) holder.remove_reagent(id, 1) +/datum/reagent/fuel/holyoil //Its oil + name = "Zelus Oil" + id = "holyoil" + description = "Oil blessed by a grater being." + taste_description = "oils" + +/datum/reagent/fuel/holyoil/on_mob_life(mob/living/carbon/M) + if(is_servant_of_ratvar(M)) + M.drowsyness = max(M.drowsyness-5, 0) + M.AdjustUnconscious(-60, 0) + M.AdjustStun(-30, 0) + M.AdjustKnockdown(-70, 0) + M.adjustStaminaLoss(-15, 0) + M.adjustToxLoss(-5, 0) + M.adjustOxyLoss(-3, 0) + M.adjustBruteLoss(-3, 0) + M.adjustFireLoss(-5, 0) + if(iscultist(M))// We REALLY hate blood cult + M.AdjustUnconscious(1, 0) + M.AdjustStun(10, 0) + M.AdjustKnockdown(20, 0) + M.adjustStaminaLoss(15, 0) + else //Were not mean + M.adjustToxLoss(3, 0) + M.adjustOxyLoss(2, 0) + M.adjustStaminaLoss(10, 0) + holder.remove_reagent(id, 1) + return TRUE + +//We only get 30u to start with... + +/datum/reagent/fuel/holyoil/reaction_obj(obj/O, reac_volume) + if(istype(O, /obj/item/stack/sheet/metal)) + var/obj/item/stack/sheet/metal/M = O + reac_volume = min(reac_volume, M.amount) + new/obj/item/stack/tile/brass(get_turf(M), reac_volume) + M.use(reac_volume) + /datum/reagent/medicine/omnizine/godblood name = "Godblood" id = "godblood" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index dc3aca6b191c382bf8856aba671bf1341554fe9e..7822cdb8c236ea58fc03d4812f74561781b6b0b2 100644 GIT binary patch delta 9775 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 yur@Ts|M*Gj3M1i03Cu(jh0LV>G2n;9M~uXh Date: Wed, 10 Jul 2019 02:43:18 -0400 Subject: [PATCH 2/8] better wording* --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 88e7e82535..895465f1e3 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -211,7 +211,7 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(iscultist(M)) - to_chat(M, "A bright light cleans your mind of the darkness of corruption!") + to_chat(M, "A fog spreads through your mind, weakening your connect to the viel and purging your mind of Nar-sen's influence") ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) @@ -1922,4 +1922,4 @@ if(added_length >= 0.20) //Only add the length if it's greater than or equal to 0.2. This is to prevent people from smoking the reagents and causing the penis to update constantly. P.length += added_length P.update() - ..() \ No newline at end of file + ..() From d53d11de6b5dafe4629a12ce6555a2f55ed7a857 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 18:21:03 -0400 Subject: [PATCH 3/8] Apply suggestions from code review Grammer and such Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/game/gamemodes/clock_cult/clock_cult.dm | 8 ++++---- code/modules/food_and_drinks/drinks/drinks/bottle.dm | 2 +- .../modules/reagents/chemistry/reagents/other_reagents.dm | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 0216abb3f9..94ca86e0dd 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -338,10 +338,10 @@ Credit where due: CLOCKCULTCHANGELOG\ \
    \ -
  • Brass Flasks: These contain 30u of Zelus oil, this oil can be used to help stun people, and more son on Blood Cult\ - It can also be used to splash onto metal to make brass. Grinding bass will give you some oil back as well.\ - You can make more brass flasks to be used as throwing weaponds if you so wish, these will not have any oil in them. They have one throw before braking making them rather useless.\ - Lastly the oil can be drank for a bost in combat, gives you stamina as well as heals quickly!\ +
  • Zelus oil: A new reagent. It can be used to heal the faithful to Ratvar, or kill heretics and moreso stun blood cultists,\ + or splashed onto metal sheets to make brass. This chemical can be found in minimal quantities by grinding brass sheets.\ +
  • Brass Flasks:Intended to store Zelus Oil in, but can also be used as fragile single use throwing weapons in a pinch! \ + These are crafted with a single sheet of brass and fit in the Clockwork Cuirass' suit storage.\ Good luck!" /obj/item/paper/servant_primer/Initialize() diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index d101375381..f85668d2b8 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -204,7 +204,7 @@ /obj/item/reagent_containers/food/drinks/holyoil name = "flask of zelus oil" - desc = "A brass flask of the zelus oil." + desc = "A brass flask of Zelus oil, a viscous fluid with a scenting of brass - this flask may be sipped or thrown." icon_state = "zelusflask" list_reagents = list("holyoil" = 30) //Powerfull volume = 30 diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 895465f1e3..95310d0500 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -211,7 +211,7 @@ /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume) if(iscultist(M)) - to_chat(M, "A fog spreads through your mind, weakening your connect to the viel and purging your mind of Nar-sen's influence") + to_chat(M, "A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence") ..() /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M) @@ -318,7 +318,7 @@ name = "Zelus Oil" id = "holyoil" description = "Oil blessed by a grater being." - taste_description = "oils" + taste_description = "metallic oil" /datum/reagent/fuel/holyoil/on_mob_life(mob/living/carbon/M) if(is_servant_of_ratvar(M)) @@ -327,7 +327,7 @@ M.AdjustStun(-30, 0) M.AdjustKnockdown(-70, 0) M.adjustStaminaLoss(-15, 0) - M.adjustToxLoss(-5, 0) + M.adjustToxLoss(-5, 0, TRUE) M.adjustOxyLoss(-3, 0) M.adjustBruteLoss(-3, 0) M.adjustFireLoss(-5, 0) From baf4529e529017f3c67dcb1d578dd5ec210247a8 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 18:32:10 -0400 Subject: [PATCH 4/8] Update other_reagents.dm --- .../reagents/chemistry/reagents/other_reagents.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 95310d0500..88b1334aad 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -317,7 +317,7 @@ /datum/reagent/fuel/holyoil //Its oil name = "Zelus Oil" id = "holyoil" - description = "Oil blessed by a grater being." + description = "Oil blessed by a greater being." taste_description = "metallic oil" /datum/reagent/fuel/holyoil/on_mob_life(mob/living/carbon/M) @@ -336,16 +336,17 @@ M.AdjustStun(10, 0) M.AdjustKnockdown(20, 0) M.adjustStaminaLoss(15, 0) - else //Were not mean - M.adjustToxLoss(3, 0) - M.adjustOxyLoss(2, 0) - M.adjustStaminaLoss(10, 0) + else //Were not mean + M.adjustToxLoss(3, 0) + M.adjustOxyLoss(2, 0) + M.adjustStaminaLoss(10, 0) holder.remove_reagent(id, 1) return TRUE //We only get 30u to start with... /datum/reagent/fuel/holyoil/reaction_obj(obj/O, reac_volume) + . = ..() if(istype(O, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = O reac_volume = min(reac_volume, M.amount) From ed89ac874b2cc2d54b2cc6ab5c57485cce5a9d7e Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 18:44:14 -0400 Subject: [PATCH 5/8] this was fine --- .../modules/reagents/chemistry/reagents/other_reagents.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 88b1334aad..e3c763c542 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -336,10 +336,10 @@ M.AdjustStun(10, 0) M.AdjustKnockdown(20, 0) M.adjustStaminaLoss(15, 0) - else //Were not mean - M.adjustToxLoss(3, 0) - M.adjustOxyLoss(2, 0) - M.adjustStaminaLoss(10, 0) + else //Were not mean + M.adjustToxLoss(3, 0) + M.adjustOxyLoss(2, 0) + M.adjustStaminaLoss(10, 0) holder.remove_reagent(id, 1) return TRUE From ac9c672fa8cac8fc08e5ff7a566a8f268c6e70ea Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 18:56:32 -0400 Subject: [PATCH 6/8] I guess this is better --- .../chemistry/reagents/other_reagents.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index e3c763c542..6b4fdf3d99 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -331,15 +331,16 @@ M.adjustOxyLoss(-3, 0) M.adjustBruteLoss(-3, 0) M.adjustFireLoss(-5, 0) - if(iscultist(M))// We REALLY hate blood cult - M.AdjustUnconscious(1, 0) - M.AdjustStun(10, 0) - M.AdjustKnockdown(20, 0) - M.adjustStaminaLoss(15, 0) - else //Were not mean - M.adjustToxLoss(3, 0) - M.adjustOxyLoss(2, 0) - M.adjustStaminaLoss(10, 0) + else + if(iscultist(M)) + M.AdjustUnconscious(1, 0) + M.AdjustStun(10, 0) + M.AdjustKnockdown(20, 0) + M.adjustStaminaLoss(15, 0) + else + M.adjustToxLoss(3, 0) + M.adjustOxyLoss(2, 0) + M.adjustStaminaLoss(10, 0) holder.remove_reagent(id, 1) return TRUE From 146276014c93c7482ee18a565ded5b8a50540f11 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 10 Jul 2019 20:42:12 -0400 Subject: [PATCH 7/8] Update other_reagents.dm --- .../reagents/chemistry/reagents/other_reagents.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 6b4fdf3d99..90c7800b31 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -331,16 +331,15 @@ M.adjustOxyLoss(-3, 0) M.adjustBruteLoss(-3, 0) M.adjustFireLoss(-5, 0) - else - if(iscultist(M)) + else if(iscultist(M)) M.AdjustUnconscious(1, 0) M.AdjustStun(10, 0) M.AdjustKnockdown(20, 0) M.adjustStaminaLoss(15, 0) - else - M.adjustToxLoss(3, 0) - M.adjustOxyLoss(2, 0) - M.adjustStaminaLoss(10, 0) + else + M.adjustToxLoss(3, 0) + M.adjustOxyLoss(2, 0) + M.adjustStaminaLoss(10, 0) holder.remove_reagent(id, 1) return TRUE From 27a8876e9951b50d921baab258a409dd613d02cf Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 11 Jul 2019 01:15:39 -0400 Subject: [PATCH 8/8] I dont care anymore, It works in testing to function fine I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim. --- .../reagents/chemistry/reagents/other_reagents.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 90c7800b31..4929c4f33d 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -331,16 +331,16 @@ M.adjustOxyLoss(-3, 0) M.adjustBruteLoss(-3, 0) M.adjustFireLoss(-5, 0) - else if(iscultist(M)) - M.AdjustUnconscious(1, 0) - M.AdjustStun(10, 0) - M.AdjustKnockdown(20, 0) - M.adjustStaminaLoss(15, 0) + if(iscultist(M)) + M.AdjustUnconscious(1, 0) + M.AdjustStun(10, 0) + M.AdjustKnockdown(20, 0) + M.adjustStaminaLoss(15, 0) else M.adjustToxLoss(3, 0) M.adjustOxyLoss(2, 0) M.adjustStaminaLoss(10, 0) - holder.remove_reagent(id, 1) + holder.remove_reagent(id, 1) return TRUE //We only get 30u to start with...