cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00: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 15:56:58 -04: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

4
code/modules/admin/db_ban/functions.dm
View File

@@ -102,7 +102,7 @@
var/a_computerid
var/a_ip
if(src.owner && istype(src.owner, /client))
if(src.owner && isclient(src.owner))
a_ckey = src.owner:ckey
a_computerid = src.owner:computer_id
a_ip = src.owner:address
@@ -405,7 +405,7 @@
to_chat(usr, "<span class='warning'>Database update failed due to multiple bans having the same ID. Contact the database admin.</span>")
return
if(!src.owner || !istype(src.owner, /client))
if(!src.owner || !isclient(src.owner))
return
var/unban_ckey = src.owner:ckey

2
code/modules/admin/player_panel.dm
View File

@@ -379,7 +379,7 @@
if(istype(disk_loc, /mob))
var/mob/M = disk_loc
dat += "carried by <a href='?src=[UID()];adminplayeropts=[M.UID()]'>[M.real_name]</a> "
if(istype(disk_loc, /obj))
if(isobj(disk_loc))
var/obj/O = disk_loc
dat += "in \a [O.name] "
disk_loc = disk_loc.loc

4
code/modules/admin/topic.dm
View File

@@ -1138,7 +1138,7 @@
return
M.loc = prison_cell
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/prisoner = M
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
@@ -1347,7 +1347,7 @@
I.plane = initial(I.plane)
I.dropped(M)
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/observer = M
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit(observer), slot_w_uniform)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(observer), slot_shoes)

2
code/modules/admin/verbs/SDQL2/SDQL_2.dm
View File

@@ -134,7 +134,7 @@
if(!temp.vv_edit_var(v, SDQL_expression(d, set_list[sets])))
to_chat(usr, "[temp] rejected your varedit.")
break
if(temp.vars.Find(v) && (istype(temp.vars[v], /datum) || istype(temp.vars[v], /client)))
if(temp.vars.Find(v) && (istype(temp.vars[v], /datum) || isclient(temp.vars[v])))
temp = temp.vars[v]
else
break

2
code/modules/admin/verbs/adminpm.dm
View File

@@ -65,7 +65,7 @@
var/client/C
if(istext(whom))
C = get_client_by_ckey(whom)
else if(istype(whom,/client))
else if(isclient(whom))
C = whom
if(!C)

4
code/modules/admin/verbs/debug.dm
View File

@@ -281,7 +281,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(!SSticker)
alert("Wait until the game starts")
return
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
log_admin("[key_name(src)] has robotized [M.key].")
spawn(10)
M:Robotize()
@@ -452,7 +452,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
if(!SSticker)
alert("Wait until the game starts")
return
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.wear_id)
var/obj/item/card/id/id = H.wear_id

4
code/modules/admin/verbs/modifyvariables.dm
View File

@@ -31,13 +31,13 @@ GLOBAL_PROTECT(VVmaint_only)
else if(ismob(var_value))
. = VV_MOB_REFERENCE
else if(isloc(var_value))
else if(isatom(var_value))
. = VV_ATOM_REFERENCE
else if(istype(var_value, /matrix))
. = VV_MATRIX
else if(istype(var_value,/client))
else if(isclient(var_value))
. = VV_CLIENT
else if(istype(var_value, /datum))

2
code/modules/admin/verbs/randomverbs.dm
View File

@@ -36,7 +36,7 @@
L.Paralyse(10 SECONDS)
sleep(5) //so they black out before warping
M.loc = pick(GLOB.prisonwarp)
if(istype(M, /mob/living/carbon/human))
if(ishuman(M))
var/mob/living/carbon/human/prisoner = M
prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform)
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)