Everything else through the door (#19358)

This commit is contained in:
Vi3trice
2022-10-13 15:56:58 -04:00
committed by GitHub
parent 2410930b2b
commit 59dfdba201
134 changed files with 200 additions and 200 deletions
+2 -2
View File
@@ -565,7 +565,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
to_chat(user, "<span class='danger'>You're going to need to remove that mask/helmet/glasses first!</span>")
return
if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/simple_animal/slime))//Aliens don't have eyes./N slimes also don't have eyes!
if(isalien(M) || isslime(M))//Aliens don't have eyes./N slimes also don't have eyes!
to_chat(user, "<span class='warning'>You cannot locate any eyes on this creature!</span>")
return
@@ -669,7 +669,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
/obj/item/proc/remove_item_from_storage(atom/newLoc) //please use this if you're going to snowflake an item out of a obj/item/storage
if(!newLoc)
return 0
if(istype(loc,/obj/item/storage))
if(isstorage(loc))
var/obj/item/storage/S = loc
S.remove_from_storage(src,newLoc)
return 1
@@ -38,7 +38,7 @@
if(target.invisibility != 0)
return
if(!active_dummy)
if(istype(target,/obj/item) && !istype(target, /obj/item/disk/nuclear))
if(isitem(target) && !istype(target, /obj/item/disk/nuclear))
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
to_chat(user, "<span class='notice'>Scanned [target].</span>")
saved_item = target.type
@@ -49,7 +49,7 @@
if((HAS_TRAIT(user, TRAIT_CLUMSY) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
if(!(istype(user, /mob/living/carbon/human) || SSticker) && SSticker.mode.name != "monkey") //don't have dexterity
if(!(ishuman(user) || SSticker) && SSticker.mode.name != "monkey") //don't have dexterity
to_chat(user, "<span class='notice'>You don't have the dexterity to do this!</span>")
return
@@ -59,7 +59,7 @@
/obj/item/teleporter/emp_act(severity)
var/teleported_something = FALSE
if(prob(50 / severity))
if(istype(loc, /mob/living/carbon/human))
if(ishuman(loc))
var/mob/living/carbon/human/user = loc
to_chat(user, "<span class='userdanger'>[src] buzzes and activates!</span>")
attempt_teleport(user, TRUE)
+1 -1
View File
@@ -320,7 +320,7 @@
else
to_chat(user, "<span class='warning'>The MMI must go in after everything else!</span>")
if(istype(W,/obj/item/pen))
if(is_pen(W))
to_chat(user, "<span class='warning'>You need to use a multitool to name [src]!</span>")
return
+1 -1
View File
@@ -23,7 +23,7 @@
else
to_chat(user, "<span class='notice'>All [R]'s systems are nominal.</span>")
if(istype(M,/mob/living/carbon/human)) //Repairing robotic limbs and IPCs
if(ishuman(M)) //Repairing robotic limbs and IPCs
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.get_organ(user.zone_selected)
+1 -1
View File
@@ -169,7 +169,7 @@
item_state = "sword0"
w_class = WEIGHT_CLASS_SMALL
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()
@@ -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)
+3 -3
View File
@@ -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()
+2 -2
View File
@@ -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()
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -146,7 +146,7 @@
// check for TK users
if(istype(usr, /mob/living/carbon/human))
if(ishuman(usr))
if(istype(usr.l_hand, /obj/item/tk_grab) || istype(usr.r_hand, /obj/item/tk_grab/))
if(!(usr in nearby))
if(usr.client && usr.machine == src)
@@ -545,7 +545,7 @@
smash(user)
/obj/item/chair/stool/attack(mob/M as mob, mob/user as mob)
if(prob(5) && istype(M,/mob/living))
if(prob(5) && isliving(M))
user.visible_message("<span class='danger'>[user] breaks [src] over [M]'s back!.</span>")
user.unEquip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal