From 6606a81fe77fb56f6520e4e966cb63f9d3794d0d Mon Sep 17 00:00:00 2001 From: CL0WNE Date: Wed, 11 Oct 2023 13:59:43 -0600 Subject: [PATCH 1/2] Update miningweapons.dm Adds Flashlights To Crusher Varients --- .../code/game/objects/items/miningweapons.dm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/monkestation/code/game/objects/items/miningweapons.dm b/monkestation/code/game/objects/items/miningweapons.dm index 13d1cfe3d1f7..40dc6511156e 100644 --- a/monkestation/code/game/objects/items/miningweapons.dm +++ b/monkestation/code/game/objects/items/miningweapons.dm @@ -22,10 +22,10 @@ attack_verb_continuous = list("slashes", "cuts", "cleaves", "chops", "swipes") attack_verb_simple = list("cleave", "chop", "cut", "swipe", "slash") sharpness = SHARP_EDGED - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = NONE - light_system = NONE - light_outer_range = 0 + light_system = MOVABLE_LIGHT + light_outer_range = 5 light_on = FALSE charged = TRUE charge_time = 10 @@ -65,10 +65,10 @@ attack_verb_continuous = list("pierces", "stabs", "impales", "pokes", "jabs") attack_verb_simple = list("imaple", "stab", "pierce", "jab", "poke") sharpness = SHARP_EDGED - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME - light_system = NONE - light_outer_range = 0 + light_system = MOVABLE_LIGHT + light_outer_range = 8 light_on = FALSE charged = TRUE charge_time = 15 @@ -114,7 +114,7 @@ attack_verb_continuous = list("slams", "crushes", "smashes", "flattens", "pounds") attack_verb_simple = list("slam", "crush", "smash", "flatten", "pound") sharpness = NONE - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME light_system = MOVABLE_LIGHT light_outer_range = 5 @@ -167,10 +167,10 @@ attack_verb_continuous = list("swipes", "slashes", "cuts", "slaps") attack_verb_simple = list("swipe", "slash", "cut", "slap") sharpness = SHARP_POINTY - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME light_system = MOVABLE_LIGHT - light_outer_range = 5 + light_outer_range = 4 light_on = FALSE charged = TRUE charge_time = 2 From 2c5f799c85ecfde9e6a1a835bbf32c6f7f7d1a66 Mon Sep 17 00:00:00 2001 From: CL0WNE Date: Wed, 11 Oct 2023 14:16:07 -0600 Subject: [PATCH 2/2] Update farts.txt --- strings/farts.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/strings/farts.txt b/strings/farts.txt index 97e3bb7174b4..aabc7298ae20 100644 --- a/strings/farts.txt +++ b/strings/farts.txt @@ -40,3 +40,4 @@ repressurizes the room. farts and blames it on the dog. winces, must have been a spicy one. didn't fart, it must have been a ghost! +unleashes their animal spirit!