mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 17:13:46 +01:00
Fixed metroids being slipped and stepping in glass shards. Wearing a suit with shoes now protect from glass shards. Surgery can now be done on roller beds, and doing it on normal tables has a slightly higher chance of working.
This commit is contained in:
@@ -12,6 +12,8 @@ BIKE HORN
|
||||
var/mob/M = AM
|
||||
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
|
||||
return
|
||||
if (istype(M, /mob/living/carbon/metroid)) //I mean they float, seriously. - Erthilo
|
||||
return
|
||||
|
||||
M.pulling = null
|
||||
M << "\blue You slipped on the [name]!"
|
||||
@@ -24,6 +26,8 @@ BIKE HORN
|
||||
var/mob/M = AM
|
||||
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
|
||||
return
|
||||
if (istype(M, /mob/living/carbon/metroid))
|
||||
return
|
||||
|
||||
M.pulling = null
|
||||
M << "\blue You slipped on the [name]!"
|
||||
@@ -36,6 +40,8 @@ BIKE HORN
|
||||
var/mob/M = AM
|
||||
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
|
||||
return
|
||||
if (istype(M, /mob/living/carbon/metroid))
|
||||
return
|
||||
|
||||
M.pulling = null
|
||||
M << "\blue You slipped on the [name]!"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -167,14 +167,18 @@ SHARDS
|
||||
/obj/item/weapon/shard/HasEntered(AM as mob|obj)
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
if (istype(M, /mob/living/carbon/metroid)) //I mean they float, seriously. - Erthilo
|
||||
return
|
||||
M << "\red <B>You step in the broken glass!</B>"
|
||||
playsound(src.loc, 'glass_step.ogg', 50, 1)
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(!H.shoes)
|
||||
var/datum/organ/external/affecting = H.get_organ(pick("l_leg", "r_leg"))
|
||||
if(!((H.shoes) || (H.wear_suit && H.wear_suit.body_parts_covered & FEET)))
|
||||
var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
|
||||
H.Weaken(3)
|
||||
affecting.take_damage(5, 0)
|
||||
H.UpdateDamageIcon()
|
||||
H.updatehealth()
|
||||
..()
|
||||
..()
|
||||
|
||||
//&& H.wear_suit.body_parts_covered&FEET)))
|
||||
Reference in New Issue
Block a user