From 9309f1e3b45e171f64ba0193375e18e456b127d3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 27 Sep 2017 23:40:49 -0500 Subject: [PATCH] Update clock_components.dm --- .../clock_items/clock_components.dm | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 06b3ac7885..b1409aae18 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -9,6 +9,20 @@ var/list/servant_of_ratvar_messages = list("ayy" = FALSE, "lmao" = TRUE) //Fluff, shown to servants of Ratvar on a low chance, if associated value is TRUE, will automatically apply ratvarian var/message_span = "heavy_brass" +/obj/item/clockwork/component/examine(mob/user) + . = ..() + if(is_servant_of_ratvar(user) || isobserver(user)) + to_chat(user, "You can activate this in your hand to break it down for power.") + +/obj/item/clockwork/component/attack_self(mob/living/user) + if(is_servant_of_ratvar(user)) + user.visible_message("[user] crushes [src] in their hand!", \ + "You crush [src], capturing its escaping energy for use as power.") + playsound(user, 'sound/effects/pop_expl.ogg', 50, TRUE) + adjust_clockwork_power(POWER_WALL_TOTAL) + user.drop_item() + qdel(src) + /obj/item/clockwork/component/pickup(mob/living/user) ..() if(iscultist(user) || (user.mind && user.mind.isholy)) @@ -22,11 +36,6 @@ var/pickedmessage = pick(servant_of_ratvar_messages) to_chat(user, "[servant_of_ratvar_messages[pickedmessage] ? "[text2ratvar(pickedmessage)]" : pickedmessage]") -/obj/item/clockwork/component/examine(mob/user) - ..() - if(is_servant_of_ratvar(user)) - to_chat(user, "You should put this in a slab or cache immediately.") - /obj/item/clockwork/component/belligerent_eye name = "belligerent eye" desc = "A brass construct with a rotating red center. It's as though it's looking for something to hurt." @@ -39,7 +48,7 @@ /obj/item/clockwork/component/belligerent_eye/blind_eye name = "blind eye" desc = "A heavy brass eye, its red iris fallen dark." - clockwork_desc = "A smashed ocular warden covered in dents. Serviceable as a substitute for a belligerent eye." + clockwork_desc = "A smashed ocular warden covered in dents." icon_state = "blind_eye" cultist_message = "The eye flickers at you with intense hate before falling dark." servant_of_ratvar_messages = list("The eye flickers before falling dark." = FALSE, "You feel watched." = FALSE, "\"...\"" = FALSE) @@ -48,7 +57,7 @@ /obj/item/clockwork/component/belligerent_eye/lens_gem name = "lens gem" desc = "A tiny pinkish gem. It catches the light oddly, almost glowing." - clockwork_desc = "The gem from an interdiction lens. Serviceable as a substitute for a belligerent eye." + clockwork_desc = "The gem from an interdiction lens." icon_state = "lens_gem" cultist_message = "The gem turns black and cold for a moment before its normal glow returns." servant_of_ratvar_messages = list("\"Disgusting failure.\"" = TRUE, "You feel scrutinized." = FALSE, "\"Weaklings.\"" = TRUE, "\"Pathetic defenses.\"" = TRUE) @@ -69,7 +78,7 @@ /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism name = "onyx prism" desc = "An onyx prism with a small aperture. It's very heavy." - clockwork_desc = "A broken prism from a prolonging prism. Serviceable as a substitute for a vanguard cogwheel." + clockwork_desc = "A broken prism from a prolonging prism." icon_state = "onyx_prism" cultist_message = "The prism grows painfully hot in your hands." servant_of_ratvar_messages = list("The prism isn't getting any lighter." = FALSE, "\"So... you haven't failed yet. Have hope, child.\"" = TRUE, \ @@ -98,7 +107,7 @@ /obj/item/clockwork/component/geis_capacitor/antennae name = "mania motor antennae" desc = "A pair of dented and bent antennae. They constantly emit a static hiss." - clockwork_desc = "The antennae from a mania motor. Serviceable as a substitute for a geis capacitor." + clockwork_desc = "The antennae from a mania motor." icon_state = "mania_motor_antennae" cultist_message = "Your head is filled with a burst of static." servant_of_ratvar_messages = list("\"Who broke this.\"" = TRUE, "\"Did you break these off YOURSELF?\"" = TRUE, "\"Why did we give this to such simpletons, anyway?\"" = TRUE, \ @@ -117,16 +126,16 @@ /obj/item/clockwork/component/replicant_alloy/smashed_anima_fragment name = "smashed anima fragment" desc = "Shattered chunks of metal. Damaged beyond repair and completely unusable." - clockwork_desc = "The sad remains of an anima fragment. Serviceable as a substitute for replicant alloy." + clockwork_desc = "The sad remains of an anima fragment." icon_state = "smashed_anime_fragment" cultist_message = "The shards vibrate in your hands for a moment." - servant_of_ratvar_messages = list("\"...still fight...\"" = FALSE, "\"...where am I...?\"" = FALSE, "\"...put me... slab...\"" = FALSE) + servant_of_ratvar_messages = list("\"...still fight...\"" = FALSE, "\"...where am I...?\"" = FALSE, "\"...bring me... back...\"" = FALSE) w_class = WEIGHT_CLASS_NORMAL /obj/item/clockwork/component/replicant_alloy/replication_plate name = "replication plate" desc = "A flat, heavy disc of metal with a triangular formation on its surface." - clockwork_desc = "The replication plate from a tinkerer's daemon. Serviceable as a substitute for replicant alloy." + clockwork_desc = "The replication plate from a tinkerer's daemon." icon_state = "replication_plate" cultist_message = "The plate shudders in your hands, as though trying to get away." servant_of_ratvar_messages = list("\"Put this in a slab and get back to work.\"" = FALSE, "\"Worse servants than you have held these.\"" = TRUE, \ @@ -146,7 +155,7 @@ /obj/item/clockwork/component/hierophant_ansible/obelisk name = "obelisk prism" desc = "A prism that occasionally glows brightly. It seems not-quite there." - clockwork_desc = "The prism from a clockwork obelisk. Serviceable as a substitute for a hierophant ansible." + clockwork_desc = "The prism from a clockwork obelisk." cultist_message = "The prism flickers wildly in your hands before resuming its normal glow." servant_of_ratvar_messages = list("You hear the distinctive sound of the Hierophant Network for a moment." = FALSE, "\"Hieroph'ant Br'o'adcas't fail'ure.\"" = TRUE, \ "The obelisk flickers wildly, as if trying to open a gateway." = FALSE, "\"Spa'tial Ga'tewa'y fai'lure.\"" = TRUE) @@ -182,6 +191,13 @@ desc = "A broken shard of some oddly malleable metal. It occasionally moves and seems to glow." clockwork_desc = "A broken shard of replicant alloy." +/obj/item/clockwork/alloy_shards/clockgolem_remains + name = "clockwork golem scrap" + desc = "A pile of scrap metal. It seems damaged beyond repair." + clockwork_desc = "The sad remains of a clockwork golem. It's broken beyond repair." + icon_state = "clockgolem_dead" + sprite_shift = 0 + /obj/item/clockwork/alloy_shards/large w_class = WEIGHT_CLASS_TINY randomsinglesprite = TRUE