Skip to content

Commit cdf896b

Browse files
IsaacnmlSunShine214Rukofamicommrmanlikesbt
authored
Cult Additions / Golem / Constructs (#13952)
* cult addition * sure * shitcoding code work * fuck oyu * unshitcodes your shitcode * Update constructs.dm * this was written at 6 am, please forgive me * Adds runic shell * fixed some stuff * fix extra qdel * fixes an extra qdel, makes constructs inherit orignal name (MAYBE) * guh?!! * eugh * more changes * more * whoopsie, wrong one * whoopsie * my bad g, small issue * pretty-fied * missing things * few nitpicks * Apply suggestions from code review Co-authored-by: Rukofamicom <oozelingcomplaints@gmail.com> * Remove warning message on soul return * no more holy metal * Update code/modules/mob/living/carbon/human/species_types/golems.dm Co-authored-by: Rukofamicom <oozelingcomplaints@gmail.com> * brainless no more * last batch of fixes * Apply suggestions from code review Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com> * Update soulstone.dm * readds one local var * Apply suggestions from code review Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com> * last few changes? * yappity yap yap * i fucking forgot this minor detail, how * last batch, i hope --------- Co-authored-by: SunShine214 <sunshineprojects214@gmail.com> Co-authored-by: Rukofamicom <oozelingcomplaints@gmail.com> Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
1 parent 63c8738 commit cdf896b

File tree

9 files changed

+243
-98
lines changed

9 files changed

+243
-98
lines changed

code/game/objects/items/stacks/sheets/mineral/runed_metal.dm

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \
1818
req_amount = 3, \
1919
time = 4 SECONDS, \
2020
crafting_flags = CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, \
21-
desc = span_cultbold("Altar: Can make Eldritch Whetstones, Construct Shells, and Flasks of Unholy Water."), \
21+
desc = span_cultbold("Altar: Can make Eldritch Whetstones, Construct Shells, Runic Golem Shells and Flasks of Unholy Water."), \
2222
required_noun = "runed metal sheet", \
2323
category = CAT_CULT, \
2424
), \
@@ -43,6 +43,16 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \
4343
and Eldritch Longswords. Emits Light."), \
4444
required_noun = "runed metal sheet", \
4545
category = CAT_CULT, \
46+
), \
47+
new /datum/stack_recipe/radial( \
48+
title = "runic golem shell", \
49+
result_type = /obj/item/golem_shell/runic, \
50+
req_amount = 10, \
51+
time = 4 SECONDS, \
52+
crafting_flags = CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, \
53+
desc = span_cultbold("Runic Golem Shell: Place a soulstone inside to activate the golem and bring it to life."), \
54+
required_noun = "runed metal sheet", \
55+
category = CAT_CULT, \
4656
), \
4757
new /datum/stack_recipe/radial( \
4858
title = "runed door", \

code/game/objects/items/storage/book.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
return
235235
to_chat(user, span_notice("You begin to exorcise [SS]."))
236236
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
237-
if(do_after(user, 40, target = SS))
237+
if(do_after(user, 4 SECONDS, target = SS))
238238
playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
239239
SS.required_role = null
240240
SS.theme = THEME_HOLY

code/modules/antagonists/cult/cult_structures.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
var/list/items = list(
8888
"Eldritch Whetstone" = image(icon = 'icons/obj/cult.dmi', icon_state = "cult_sharpener"),
8989
"Construct Shell" = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct_cult"),
90-
"Flask of Unholy Water" = image(icon = 'icons/obj/drinks/drinks.dmi', icon_state = "holyflask")
90+
"Flask of Unholy Water" = image(icon = 'icons/obj/drinks/drinks.dmi', icon_state = "holyflask"),
91+
"Runic Golem Shell" = image(icon = 'icons/obj/wizard.dmi', icon_state = "construct")
9192
)
9293
var/choice = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
9394
var/list/pickedtype = list()
@@ -98,6 +99,8 @@
9899
pickedtype += /obj/structure/constructshell
99100
if("Flask of Unholy Water")
100101
pickedtype += /obj/item/reagent_containers/cup/glass/bottle/unholywater
102+
if("Runic Golem Shell")
103+
pickedtype += /obj/item/golem_shell/runic
101104
else
102105
return
103106
if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated && IS_CULTIST(user) && cooldowntime <= world.time)

0 commit comments

Comments
 (0)