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
+4 -4
View File
@@ -490,7 +490,7 @@
var/datum/D = value
item = "<a href='?_src_=vars;Vars=[D.UID()]'>[VV_HTML_ENCODE(name)] \ref[value]</a> = [D.type]"
else if(istype(value, /client))
else if(isclient(value))
var/client/C = value
item = "<a href='?_src_=vars;Vars=[C.UID()]'>[VV_HTML_ENCODE(name)] \ref[value]</a> = [C] [C.type]"
//
@@ -569,7 +569,7 @@
if(!check_rights(R_VAREDIT)) return
var/D = locateUID(href_list["datumedit"])
if(!istype(D,/datum) && !istype(D,/client))
if(!istype(D,/datum) && !isclient(D))
to_chat(usr, "This can only be used on instances of types /client or /datum")
return
@@ -579,7 +579,7 @@
if(!check_rights(R_VAREDIT)) return
var/atom/D = locateUID(href_list["subject"])
if(!istype(D,/datum) && !istype(D,/client))
if(!istype(D,/datum) && !isclient(D))
to_chat(usr, "This can only be used on instances of types /client or /datum")
return
if(!(href_list["var"] in D.vars))
@@ -594,7 +594,7 @@
if(!check_rights(R_VAREDIT)) return
var/D = locateUID(href_list["datumchange"])
if(!istype(D,/datum) && !istype(D,/client))
if(!istype(D,/datum) && !isclient(D))
to_chat(usr, "This can only be used on instances of types /client or /datum")
return
+1 -1
View File
@@ -86,7 +86,7 @@
var/target_zone = pick(head_ch;1,body_ch;2,hands_ch;3,feet_ch;4)
if(istype(src, /mob/living/carbon/human))
if(ishuman(src))
var/mob/living/carbon/human/H = src
switch(target_zone)
@@ -28,7 +28,7 @@ BONUS
..()
if(prob(SYMPTOM_ACTIVATION_PROB))
var/mob/living/M = A.affected_mob
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
switch(A.stage)
@@ -37,7 +37,7 @@ Bonus
var/get_damage = rand(1, 2)
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/list/parts = H.get_damaged_organs(TRUE, TRUE, AFFECT_ORGANIC_ORGAN) //1,1 because it needs inputs.
@@ -29,7 +29,7 @@ BONUS
if(prob(SYMPTOM_ACTIVATION_PROB))
var/mob/living/M = A.affected_mob
to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(NO_HAIR in H.dna.species.species_traits)
return // Hair can't fall out if you don't have any
@@ -28,7 +28,7 @@ BONUS
..()
if(prob(SYMPTOM_ACTIVATION_PROB))
var/mob/living/M = A.affected_mob
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.s_tone == -85)
return
@@ -72,7 +72,7 @@ BONUS
..()
if(prob(SYMPTOM_ACTIVATION_PROB))
var/mob/living/M = A.affected_mob
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.s_tone == 85)
return
@@ -28,7 +28,7 @@ BONUS
..()
if(prob(SYMPTOM_ACTIVATION_PROB * 2))
var/mob/living/M = A.affected_mob
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
switch(A.stage)
if(1)
+1 -1
View File
@@ -55,7 +55,7 @@ STI KALY - blind
/datum/disease/wizarditis/proc/spawn_wizard_clothes(chance = 0)
if(istype(affected_mob, /mob/living/carbon/human))
if(ishuman(affected_mob))
var/mob/living/carbon/human/H = affected_mob
if(prob(chance) && !isplasmaman(H))
if(!istype(H.head, /obj/item/clothing/head/wizard))
+1 -1
View File
@@ -608,7 +608,7 @@
var/list/possible_targets = list()
var/list/possible_targets_random = list()
for(var/datum/mind/possible_target in SSticker.minds)
if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
if((possible_target != src) && ishuman(possible_target.current))
possible_targets += possible_target.current // Allows for admins to pick off station roles
if(!is_invalid_target(possible_target))
possible_targets_random += possible_target.current // For random picking, only valid targets
+3 -3
View File
@@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if(overlay)
for(var/atom/target in targets)
var/location
if(istype(target,/mob/living))
if(isliving(target))
location = target.loc
else if(istype(target,/turf))
location = target
@@ -393,11 +393,11 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
SHOULD_CALL_PARENT(TRUE)
for(var/atom/target in targets)
var/location
if(istype(target,/mob/living))
if(isliving(target))
location = target.loc
else if(istype(target,/turf))
location = target
if(istype(target,/mob/living) && message)
if(isliving(target) && message)
to_chat(target, text("[message]"))
if(sparks_spread)
do_sparks(sparks_amt, 0, location)
+1 -1
View File
@@ -25,7 +25,7 @@
var/list/turfs = new/list()
for(var/turf/T in range(target,outer_tele_radius))
if(T in range(target,inner_tele_radius)) continue
if(istype(T,/turf/space) && !include_space) continue
if(isspaceturf(T) && !include_space) continue
if(T.density && !include_dense) continue
if(T.x>world.maxx-outer_tele_radius || T.x<outer_tele_radius) continue //putting them at the edge is dumb
if(T.y>world.maxy-outer_tele_radius || T.y<outer_tele_radius) continue
+1 -1
View File
@@ -110,7 +110,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
if(user.stat || user.restrained())
return FALSE
if(!(istype(user, /mob/living/carbon/human)))
if(!(ishuman(user)))
return FALSE
// If the uplink's holder is in the user's contents