mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
Everything else through the door (#19358)
This commit is contained in:
@@ -56,7 +56,7 @@
|
||||
cooldown = world.time + 30 SECONDS
|
||||
var/turf/T = get_turf(src)
|
||||
for(var/mob/living/carbon/M in ohearers(7, T))
|
||||
if(istype(M, /mob/living/carbon/human))
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(!H.can_hear())
|
||||
continue
|
||||
|
||||
@@ -70,10 +70,10 @@
|
||||
/obj/item/dnainjector/proc/inject(mob/living/M, mob/user)
|
||||
if(used)
|
||||
return
|
||||
if(istype(M,/mob/living))
|
||||
if(isliving(M))
|
||||
M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE)
|
||||
var/mob/living/carbon/human/H
|
||||
if(istype(M, /mob/living/carbon/human))
|
||||
if(ishuman(M))
|
||||
H = M
|
||||
|
||||
if(!buf)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
if(garrote_time > world.time) // Cooldown
|
||||
return
|
||||
|
||||
if(!istype(user, /mob/living/carbon/human)) // spap_hand is a proc of /mob/living, user is simply /mob
|
||||
if(!ishuman(user)) // spap_hand is a proc of /mob/living, user is simply /mob
|
||||
return
|
||||
|
||||
var/mob/living/carbon/human/U = user
|
||||
@@ -54,7 +54,7 @@
|
||||
to_chat(user, "<span class = 'warning'>You must use both hands to garrote [M]!</span>")
|
||||
return
|
||||
|
||||
if(!istype(M, /mob/living/carbon/human))
|
||||
if(!ishuman(M))
|
||||
to_chat(user, "<span class = 'warning'>You don't think that garroting [M] would be very effective...</span>")
|
||||
return
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
return
|
||||
|
||||
|
||||
if(!istype(loc, /mob/living/carbon/human))
|
||||
if(!ishuman(loc))
|
||||
strangling = null
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
/obj/item/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom)
|
||||
var/burned = rand(1,3)
|
||||
if(istype(hit_atom ,/mob/living))
|
||||
if(isliving(hit_atom))
|
||||
var/mob/living/M = hit_atom
|
||||
M.take_organ_damage(0, burned)
|
||||
return ..()
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
|
||||
set_light(0)
|
||||
to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
playsound(user, 'sound/weapons/saberoff.ogg', 35, 1)
|
||||
to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
@@ -148,7 +148,7 @@
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
slot_flags = null
|
||||
to_chat(user, "<span class='notice'>[src] can now be concealed.</span>")
|
||||
if(istype(user,/mob/living/carbon/human))
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
H.update_inv_l_hand()
|
||||
H.update_inv_r_hand()
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
to_chat(user, "<span class='notice'>You 'clean' \the [target.name].</span>")
|
||||
if(issimulatedturf(target))
|
||||
new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target)
|
||||
else if(istype(target,/mob/living/carbon))
|
||||
else if(iscarbon(target))
|
||||
for(var/obj/item/carried_item in target.contents)
|
||||
if(!istype(carried_item, /obj/item/implant))//If it's not an implant.
|
||||
carried_item.add_mob_blood(target)//Oh yes, there will be blood...
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/obj/item/storage/internal/proc/handle_mousedrop(mob/user as mob, obj/over_object as obj)
|
||||
if(ishuman(user)) //so monkeys can take off their backpacks -- Urist
|
||||
|
||||
if(istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
|
||||
if(ismecha(user.loc)) // stops inventory actions in a mech
|
||||
return 0
|
||||
|
||||
if(over_object == user && Adjacent(user)) // this must come before the screen objects only block
|
||||
|
||||
@@ -822,7 +822,7 @@
|
||||
Z.ex_act(2)
|
||||
charged = 3
|
||||
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
|
||||
else if(istype(A, /obj/structure) || ismecha(A))
|
||||
else if(isstructure(A) || ismecha(A))
|
||||
var/obj/Z = A
|
||||
Z.ex_act(2)
|
||||
charged = 3
|
||||
|
||||
Reference in New Issue
Block a user