Everything else through the door (#19358)

This commit is contained in:
Vi3trice
2022-10-13 21:56:58 +02:00
committed by GitHub
parent 2410930b2b
commit 59dfdba201
134 changed files with 200 additions and 200 deletions
+1 -1
View File
@@ -44,7 +44,7 @@
var/station_zlevel = level_name_to_num(MAIN_STATION)
for(var/turf/T in block(locate(1, 1, station_zlevel), locate(world.maxx, world.maxy, station_zlevel)))
if(istype(T,/turf/simulated/floor))
if(isfloorturf(T))
if(!(T:burnt))
src.floor += 12
else
+1 -1
View File
@@ -93,7 +93,7 @@
if(!QDELETED(src) && picked_type && Adjacent(user) && !user.incapacitated() && cooldowntime <= world.time)
cooldowntime = world.time + creation_delay
var/obj/O = new picked_type
if(istype(O, /obj/structure) || !user.put_in_hands(O))
if(isstructure(O) || !user.put_in_hands(O))
O.forceMove(get_turf(src))
to_chat(user, replacetext("[creation_message]", "%ITEM%", "[O.name]"))
@@ -272,7 +272,7 @@
var/list/all_items = M.GetAllContents()
for(var/obj/I in all_items)
if(istype(I, /obj/item/radio))
if(isradio(I))
var/obj/item/radio/R = I
R.listening = FALSE // Prevents the radio from buzzing due to the EMP, preserving possible stealthiness.
R.emp_act(1)
@@ -22,7 +22,7 @@
if(get_dist(get_turf(src), get_turf(A)) > 1)
to_chat(src, "<span class='danger'>You're too far from [A] to disguise it as a bomb.</span>")
return
if(istype(A, /obj/))
if(isobj(A))
if(bomb_cooldown <= world.time && !stat)
var/obj/item/guardian_bomb/B = new /obj/item/guardian_bomb(get_turf(A))
add_attack_logs(src, A, "booby trapped (summoner: [summoner])")
@@ -283,7 +283,7 @@
if(ambush_prepared)
ambush_attack(L)
return TRUE // No double attack
else if(istype(target,/obj/item)) // Eat items just to be annoying
else if(isitem(target)) // Eat items just to be annoying
var/obj/item/I = target
if(!I.anchored)
try_eat(I)
+1 -1
View File
@@ -309,7 +309,7 @@
/datum/game_mode/proc/is_operatives_are_dead()
for(var/datum/mind/operative_mind in syndicates)
if(!istype(operative_mind.current,/mob/living/carbon/human))
if(!ishuman(operative_mind.current))
if(operative_mind.current)
if(operative_mind.current.stat!=2)
return 0
+1 -1
View File
@@ -718,7 +718,7 @@ GLOBAL_LIST_EMPTY(multiverse)
if(unlimited) //no point, the list isn't used.
return
for(var/X in spooky_scaries)
if(!istype(X, /mob/living/carbon/human))
if(!ishuman(X))
spooky_scaries.Remove(X)
continue
var/mob/living/carbon/human/H = X
+2 -2
View File
@@ -35,13 +35,13 @@
for(var/datum/mind/wizard in wizards)
if(isnull(wizard.current))
continue
if(!istype(wizard.current,/mob/living/carbon))
if(!iscarbon(wizard.current))
if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards
to_chat(wizard.current, "<span class='warning'>If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums</span>")
message_admins("[wizard.current] was transformed in the wizard lair, another wizard is likely camping")
end_squabble(get_area(wizard.current))
continue
if(istype(wizard.current,/mob/living/carbon/brain))
if(isbrain(wizard.current))
if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards
to_chat(wizard.current, "<span class='warning'>If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums</span>")
message_admins("[wizard.current] was brainified in the wizard lair, another wizard is likely camping")
+1 -1
View File
@@ -1050,7 +1050,7 @@
desc = "This book is more horse than your mind has room for."
/obj/item/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob)
if(istype(user, /mob/living/carbon/human))
if(ishuman(user))
to_chat(user, "<font size='15' color='red'><b>HOR-SIE HAS RISEN</b></font>")
var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
magichead.flags |= NODROP | DROPDEL //curses!
+2 -2
View File
@@ -164,7 +164,7 @@
// Wizards
for(var/datum/mind/wizard in wizards)
if(!istype(wizard.current,/mob/living/carbon))
if(!iscarbon(wizard.current))
continue
if(wizard.current.stat==DEAD)
continue
@@ -175,7 +175,7 @@
// Apprentices
if(!wizards_alive)
for(var/datum/mind/apprentice in apprentices)
if(!istype(apprentice.current,/mob/living/carbon))
if(!iscarbon(apprentice.current))
continue
if(apprentice.current.stat==DEAD)
continue