cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the crush verb from the game. (#10046)

Browse Source
This commit is contained in:
Matt Atlas
2020-09-26 13:25:12 +02:00
committed by GitHub
parent 0ea5a20693
commit 16378cd4ad
3 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_powers.dm
-43
View File
@@ -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, "<span class='warning'>Your arms are still recovering!</span>")
return
if(use_check_and_message(usr))
return
var/obj/item/grab/G = src.get_active_hand()
if(!istype(G))
to_chat(src, "<span class='warning'>You are not grabbing anyone.</span>")
return
if(G.state < GRAB_NECK)
to_chat(src, "<span class='warning'>You must have a stronger grab to crush your prey!</span>")
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, "<span class='danger'>They are missing that limb!</span>")
return
H.apply_damage(40, BRUTE, hit_zone)
visible_message("<span class='warning'><b>[src]</b> viciously crushes [affected] of [G.affecting] with its metallic arms!</span>")
msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(H)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",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("<span class='warning'><b>[src]</b> viciously crushes [G.affecting]'s flesh with its metallic arms!</span>")
msg_admin_attack("[key_name_admin(src)] crushed [key_name_admin(M)] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)",ckey=key_name(src),ckey_target=key_name(M))
playsound(src.loc, 'sound/weapons/heavysmash.ogg', 50, 1)
last_special = world.time + 100
code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm
+1 -2
View File
@@ -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"