diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 19c7ce69de9..e504b2d6dc3 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -1184,46 +1184,3 @@ mob/living/carbon/human/proc/change_monitor() for(var/line in airInfo) to_chat(src, SPAN_NOTICE("[line]")) return - -/mob/living/carbon/human/proc/crush() - set category = "Abilities" - set name = "Crush" - set desc = "While grabbing someone in a neck grab, crush them with your arms." - - if(last_special > world.time) - to_chat(src, "Your arms are still recovering!") - return - - if(use_check_and_message(usr)) - return - - var/obj/item/grab/G = src.get_active_hand() - if(!istype(G)) - to_chat(src, "You are not grabbing anyone.") - return - - if(G.state < GRAB_NECK) - to_chat(src, "You must have a stronger grab to crush your prey!") - return - - if(ishuman(G.affecting)) - var/mob/living/carbon/human/H = G.affecting - var/hit_zone = zone_sel.selecting - var/obj/item/organ/external/affected = H.get_organ(hit_zone) - - if(!affected || affected.is_stump()) - to_chat(H, "They are missing that limb!") - return - - H.apply_damage(40, BRUTE, hit_zone) - visible_message("[src] viciously crushes [affected] of [G.affecting] with its metallic arms!") - msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(H)] (JMP)",ckey=key_name(src),ckey_target=key_name(H)) - else - var/mob/living/M = G.affecting - if(!istype(M)) - return - M.apply_damage(40,BRUTE) - visible_message("[src] viciously crushes [G.affecting]'s flesh with its metallic arms!") - msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(M)] (JMP)",ckey=key_name(src),ckey_target=key_name(M)) - playsound(src.loc, 'sound/weapons/heavysmash.ogg', 50, 1) - last_special = world.time + 100 diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index 850e87a6706..09757c02284 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -314,8 +314,7 @@ inherent_verbs = list( /mob/living/carbon/human/proc/self_diagnostics, - /mob/living/carbon/human/proc/check_tag, - /mob/living/carbon/human/proc/crush + /mob/living/carbon/human/proc/check_tag ) examine_color = "#688359" diff --git a/html/changelogs/mattatlas-removecrush.yml b/html/changelogs/mattatlas-removecrush.yml new file mode 100644 index 00000000000..5b446a6533c --- /dev/null +++ b/html/changelogs/mattatlas-removecrush.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "The crush verb has been removed from G2 IPCs."