From 098b0fc326d4a76f2ba64a3d66c451be2855621d Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 16 Jan 2021 14:39:54 -0300 Subject: [PATCH 1/2] logv1 --- .../mob/living/simple_animal/friendly/mouse.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c0b3e188..b78d9d9e 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -193,3 +193,19 @@ atmos_spawn_air("plasma=15;TEMP=750") explosion(src.loc, 0, 0, 2, 0, 1, 0, 2, 0, 0) qdel(src) + +/mob/living/simple_animal/mouse/boommouse/attackby(obj/item/I, mob/living/user, params) + var/turf/T = get_turf(src) + message_admins("[ADMIN_LOOKUPFLW(user)] is attacking a boommouse at [ADMIN_VERBOSEJMP(T)].") + if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/W = I + if(W.welding) + user.visible_message("[user] burns the boommouse with [user.p_their()] [W.name]!", "That was stupid of you.") + var/message_admins = "[ADMIN_LOOKUPFLW(params)] triggered a boommouse explosion at [ADMIN_VERBOSEJMP(T)]." + GLOB.bombers += message_admins + message_admins(message_admins) + user.log_message("triggered a boommouse explosion.", LOG_ATTACK) + death() + return ..() + + //TODO - look into attacked_by to make this better and less shitcode From d3b8b1d1aac9103ba0751597f1aff4b1eb6d8088 Mon Sep 17 00:00:00 2001 From: Archie Date: Sat, 16 Jan 2021 22:15:05 -0300 Subject: [PATCH 2/2] Fixes --- code/modules/mob/living/simple_animal/friendly/mouse.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index b78d9d9e..5288f5e9 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -189,6 +189,8 @@ icon_dead = "mouse_plasma" //No need for a dead sprite since it qdels itself on death /mob/living/simple_animal/mouse/boommouse/death(gibbed, toast) + var/turf/T = get_turf(src) + message_admins("A boommouse explosion was triggered at [ADMIN_VERBOSEJMP(T)].") visible_message("The boommouse violently explodes!") atmos_spawn_air("plasma=15;TEMP=750") explosion(src.loc, 0, 0, 2, 0, 1, 0, 2, 0, 0) @@ -201,7 +203,7 @@ var/obj/item/weldingtool/W = I if(W.welding) user.visible_message("[user] burns the boommouse with [user.p_their()] [W.name]!", "That was stupid of you.") - var/message_admins = "[ADMIN_LOOKUPFLW(params)] triggered a boommouse explosion at [ADMIN_VERBOSEJMP(T)]." + var/message_admins = "[ADMIN_LOOKUPFLW(user)] triggered a boommouse explosion at [ADMIN_VERBOSEJMP(T)]." GLOB.bombers += message_admins message_admins(message_admins) user.log_message("triggered a boommouse explosion.", LOG_ATTACK)