cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Cyborgs With Guns Can Now Perform Executions (With Guns!). (#25275)

Browse Source 
* borg execution time

* Update gun.dm

* Update gun.dm

* Update gun.dm
This commit is contained in:
CRUNCH
2024-05-01 23:58:35 +00:00
committed by GitHub
parent 41eff52fac
commit 1feb21eed1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+5 -3
View File
@@ -449,16 +449,18 @@
return FALSE
return TRUE
/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params)
if(!ishuman(user) || !ishuman(target))
/obj/item/gun/proc/handle_suicide(mob/user, mob/living/carbon/human/target, params)
if(!ishuman(target)) // So only human-type mobs can be executed.
return
if(semicd)
return
if(user == target)
if(!ishuman(user)) // Borg suicide needs a refactor for this to work.
return
target.visible_message("<span class='warning'>[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...</span>", \
"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
else
target.visible_message("<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>", \
"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>")