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

Rebalances Golems, Refactors Species Based Equipping (#12358)

Browse Source
This commit is contained in:
Fox McCloud
2019-09-21 06:10:37 -07:00
committed by variableundefined
parent 4fabdfb78e
commit d5759a0db5
27 changed files with 449 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/mousetrap.dm
+7 -1
View File
@@ -37,12 +37,18 @@
if(holder)
holder.update_icon()
/obj/item/assembly/mousetrap/proc/triggered(mob/target, var/type = "feet")
/obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
if(!armed)
return
var/obj/item/organ/external/affecting = null
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(PIERCEIMMUNE in H.dna.species.species_traits)
playsound(src, 'sound/effects/snap.ogg', 50, TRUE)
armed = FALSE
update_icon()
pulse(FALSE)
return FALSE
switch(type)
if("feet")
if(!H.shoes)