From 8b686d5bc169ddafabc36ffbf83d11d513e6dd62 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 9 Mar 2023 19:46:07 -0300 Subject: [PATCH] tesla body tweak (#15972) --- code/modules/mob/living/carbon/human/species/species.dm | 3 +++ .../human/species/station/tajara/tajaran_subspecies.dm | 6 ++++-- code/modules/projectiles/gun.dm | 3 ++- html/changelogs/alberyk-teslabody.yml | 6 ++++++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-teslabody.yml diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index dd0215fd0aa..6a7eb400f02 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -847,3 +847,6 @@ /datum/species/proc/handle_middle_mouse_click(var/atom/target) return + +/datum/species/proc/can_use_guns() + return TRUE diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index faea57f19b9..bdc4073095d 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -153,7 +153,6 @@ standing_jump_range = 1 injection_mod = 2 - has_fine_manipulation = FALSE bodyfall_sound = /singleton/sound_category/bodyfall_machine_sound @@ -203,4 +202,7 @@ ) /datum/species/tajaran/tesla_body/can_double_fireman_carry() - return TRUE \ No newline at end of file + return TRUE + +/datum/species/tajaran/tesla_body/can_use_guns() + return FALSE \ No newline at end of file diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ed53b5c1ed5..3d424b4ca71 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -228,7 +228,8 @@ if(no_guns_check) to_chat(A, SPAN_WARNING("[no_guns_check]")) // the proc returns the no_guns_message return FALSE - + if(A.species && !A.species.can_use_guns()) + return FALSE if((M.is_clumsy()) && prob(40)) //Clumsy handling var/obj/P = consume_next_projectile() if(P) diff --git a/html/changelogs/alberyk-teslabody.yml b/html/changelogs/alberyk-teslabody.yml new file mode 100644 index 00000000000..6b259921369 --- /dev/null +++ b/html/changelogs/alberyk-teslabody.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Tesla Rejuvenation Suits can now use tools and do more stuff, but can't use guns still."