mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning * Update stack.dm
This commit is contained in:
@@ -893,7 +893,7 @@ GLOBAL_VAR_INIT(gamma_ship_location, 1) // 0 = station , 1 = space
|
||||
if(!frommob.ckey)
|
||||
return 0
|
||||
|
||||
if(istype(tothing, /obj/item))
|
||||
if(isitem(tothing))
|
||||
var/mob/living/toitem = tothing
|
||||
|
||||
var/ask = alert("Are you sure you want to allow [frommob.name]([frommob.key]) to possess [toitem.name]?", "Place ghost in control of item?", "Yes", "No")
|
||||
|
||||
@@ -787,7 +787,7 @@ GLOBAL_LIST_INIT(admin_verbs_maintainer, list(
|
||||
return
|
||||
|
||||
if(!istype(H))
|
||||
if(istype(H, /mob/living/carbon/brain))
|
||||
if(isbrain(H))
|
||||
var/mob/living/carbon/brain/B = H
|
||||
if(istype(B.container, /obj/item/mmi/robotic_brain/positronic))
|
||||
var/obj/item/mmi/robotic_brain/positronic/C = B.container
|
||||
@@ -813,7 +813,7 @@ GLOBAL_LIST_INIT(admin_verbs_maintainer, list(
|
||||
return
|
||||
|
||||
if(!istype(H))
|
||||
if(istype(H, /mob/living/carbon/brain))
|
||||
if(isbrain(H))
|
||||
var/mob/living/carbon/brain/B = H
|
||||
if(istype(B.container, /obj/item/mmi/robotic_brain/positronic))
|
||||
var/obj/item/mmi/robotic_brain/positronic/C = B.container
|
||||
|
||||
@@ -2667,7 +2667,7 @@
|
||||
if(istype(O,/mob))
|
||||
var/mob/M = O
|
||||
M.real_name = obj_name
|
||||
if(where == "inhand" && isliving(usr) && istype(O, /obj/item))
|
||||
if(where == "inhand" && isliving(usr) && isitem(O))
|
||||
var/mob/living/L = usr
|
||||
var/obj/item/I = O
|
||||
L.put_in_hands(I)
|
||||
@@ -2972,7 +2972,7 @@
|
||||
if("fakeguns")
|
||||
SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Fake Guns")
|
||||
for(var/obj/item/W in world)
|
||||
if(istype(W, /obj/item/clothing) || istype(W, /obj/item/card/id) || istype(W, /obj/item/disk) || istype(W, /obj/item/tank))
|
||||
if(isclothing(W) || istype(W, /obj/item/card/id) || istype(W, /obj/item/disk) || istype(W, /obj/item/tank))
|
||||
continue
|
||||
W.icon = 'icons/obj/guns/projectile.dmi'
|
||||
W.icon_state = "revolver"
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
var/datum/gas_mixture/GM = target.return_air()
|
||||
var/burning = 0
|
||||
if(istype(target, /turf/simulated))
|
||||
if(issimulatedturf(target))
|
||||
var/turf/simulated/T = target
|
||||
if(T.active_hotspot)
|
||||
burning = 1
|
||||
|
||||
Reference in New Issue
Block a user