cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Everything else through the door (#19358)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/wizard/artefact.dm
+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
code/game/gamemodes/wizard/raginmages.dm
+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")
code/game/gamemodes/wizard/spellbook.dm
+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!
code/game/gamemodes/wizard/wizard.dm
+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