diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 925c9481831..800b5b88444 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -151,4 +151,4 @@ /datum/wires/explosive/gibtonite/explode() var/obj/item/gibtonite/P = holder - P.GibtoniteReaction(null, 2) + P.GibtoniteReaction(null, "A wire signal has primed a") diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 18876dfc927..1c635f07a5a 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -271,7 +271,6 @@ /obj/item/toy/plush/carpplushie = 3, /obj/item/toy/plush/lizard_plushie/green = 3, /obj/item/toy/plush/lizard_plushie/space/green = 3, - /obj/item/toy/plush/awakenedplushie = 3, /obj/item/toy/plush/goatplushie = 3, /obj/item/toy/plush/rouny = 3, /obj/item/toy/plush/abductor = 3, diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 77b76d85224..eab3f34d343 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -584,6 +584,7 @@ squeak_override = list('sound/effects/blobattack.ogg' = 1) gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy +// This is supposed to be only in the bus ruin, don't spawn it elsewhere /obj/item/toy/plush/awakenedplushie name = "awakened plushie" desc = "An ancient plushie that has grown enlightened to the true nature of reality." diff --git a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm index fc87d094477..39c17d2346c 100644 --- a/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm +++ b/code/game/objects/items/stacks/golem_food/golem_hand_actions.dm @@ -35,7 +35,7 @@ playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE) held_gibtonite.forceMove(get_turf(src)) held_gibtonite.det_time = 2 SECONDS - held_gibtonite.GibtoniteReaction(user) + held_gibtonite.GibtoniteReaction(user, "A [src] has targeted [target] with a thrown and primed") held_gibtonite.throw_at(target, range = 10, speed = 3, thrower = user) held_gibtonite = null qdel(src) @@ -44,7 +44,7 @@ /// Called when you can't hold it in any longer and just drop it on the ground /obj/item/gibtonite_hand/proc/release_gibtonite() held_gibtonite.forceMove(get_turf(src)) - held_gibtonite.GibtoniteReaction(isliving(loc) ? loc : null) + held_gibtonite.GibtoniteReaction(isliving(loc) ? loc : null, "A [src] has dropped and primed a") held_gibtonite = null qdel(src) diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm index be4516a0db7..58821ec5358 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain.dm @@ -25,7 +25,6 @@ mail_goodies = list( /obj/item/reagent_containers/cup/glass/bottle/holywater = 30, - /obj/item/toy/plush/awakenedplushie = 10, /obj/item/grenade/chem_grenade/holy = 5, /obj/item/toy/plush/narplush = 2, /obj/item/toy/plush/ratplush = 1 diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index a656aa467d6..c9fdb9747e5 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -188,7 +188,9 @@ new /obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian(src) new /obj/item/clothing/suit/hooded/ian_costume(src) if(67 to 68) - new /obj/item/toy/plush/awakenedplushie(src) + var/obj/item/gibtonite/free_bomb = new /obj/item/gibtonite(src) + free_bomb.quality = rand(1, 3) + free_bomb.GibtoniteReaction(null, "A secure loot closet has spawned a live") if(69 to 70) new /obj/item/stack/ore/bluespace_crystal(src, 5) if(71 to 72) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index e9c652fd7bd..b01b537ec80 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return if(I.tool_behaviour == TOOL_MINING || istype(I, /obj/item/resonator) || I.force >= 10) - GibtoniteReaction(user) + GibtoniteReaction(user, "A resonator has primed for detonation a") return if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) || I.tool_behaviour == TOOL_MULTITOOL) @@ -294,14 +294,14 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return ..() /obj/item/gibtonite/bullet_act(obj/projectile/P) - GibtoniteReaction(P.firer) + GibtoniteReaction(P.firer, "A projectile has primed for detonation a") return ..() /obj/item/gibtonite/ex_act() - GibtoniteReaction(null, 1) + GibtoniteReaction(null, "An explosion has primed for detonation a") return TRUE -/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0) +/obj/item/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by) if(primed) return primed = TRUE @@ -311,18 +311,16 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ if(!is_mining_level(z))//Only annoy the admins ingame if we're triggered off the mining zlevel notify_admins = TRUE - if(triggered_by == 1) - log_bomber(null, "An explosion has primed a", src, "for detonation", notify_admins) - else if(triggered_by == 2) - var/turf/bombturf = get_turf(src) - if(notify_admins) - message_admins("A signal has triggered a [name] to detonate at [ADMIN_VERBOSEJMP(bombturf)]. Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]") - var/bomb_message = "A signal has primed a [name] for detonation at [AREACOORD(bombturf)]. Igniter attacher: [key_name(attacher)]." - log_game(bomb_message) - GLOB.bombers += bomb_message - else + if(user) user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("You strike \the [src], causing a chain reaction.")) - log_bomber(user, "has primed a", src, "for detonation", notify_admins) + + var/attacher_text = attacher ? "Igniter attacher: [ADMIN_LOOKUPFLW(attacher)]" : null + + if(triggered_by) + log_bomber(user, triggered_by, src, attacher_text, notify_admins) + else + log_bomber(user, "Something has primed a", src, "for detonation.[attacher_text ? " " : ""][attacher_text]", notify_admins) + det_timer = addtimer(CALLBACK(src, PROC_REF(detonate), notify_admins), det_time, TIMER_STOPPABLE) /obj/item/gibtonite/proc/detonate(notify_admins)