mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
[MIRROR] some istype to macros (#9802)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
73486c399b
commit
ed79946ade
@@ -172,7 +172,7 @@
|
||||
/obj/vehicle/train/engine/RunOver(var/mob/living/M)
|
||||
..()
|
||||
|
||||
if(is_train_head() && istype(load, /mob/living/carbon/human))
|
||||
if(is_train_head() && ishuman(load))
|
||||
var/mob/living/carbon/human/D = load
|
||||
to_chat(D, span_bolddanger("You ran over [M]!"))
|
||||
visible_message(span_bolddanger("\The [src] ran over [M]!"))
|
||||
@@ -228,7 +228,7 @@
|
||||
set category = "Object.Vehicle" //ChompEDIT - TGPanel
|
||||
set src in view(0)
|
||||
|
||||
if(!istype(usr, /mob/living/carbon/human))
|
||||
if(!ishuman(usr))
|
||||
return
|
||||
|
||||
if(on)
|
||||
@@ -251,7 +251,7 @@
|
||||
set category = "Object.Vehicle" //ChompEDIT - TGPanel
|
||||
set src in view(0)
|
||||
|
||||
if(!istype(usr, /mob/living/carbon/human))
|
||||
if(!ishuman(usr))
|
||||
return
|
||||
|
||||
if(!on)
|
||||
@@ -267,7 +267,7 @@
|
||||
set category = "Object.Vehicle" //ChompEDIT - TGPanel
|
||||
set src in view(0)
|
||||
|
||||
if(!istype(usr, /mob/living/carbon/human))
|
||||
if(!ishuman(usr))
|
||||
return
|
||||
|
||||
if(!key || (load && load != usr))
|
||||
@@ -289,7 +289,7 @@
|
||||
/obj/vehicle/train/trolley/load(var/atom/movable/C, var/mob/user)
|
||||
if(ismob(C) && !passenger_allowed)
|
||||
return 0
|
||||
if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !istype(C, /mob/living/carbon/human))
|
||||
if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !ishuman(C))
|
||||
return 0
|
||||
|
||||
//if there are any items you don't want to be able to interact with, add them to this check
|
||||
@@ -303,7 +303,7 @@
|
||||
return 1
|
||||
|
||||
/obj/vehicle/train/engine/load(var/atom/movable/C, var/mob/user)
|
||||
if(!istype(C, /mob/living/carbon/human))
|
||||
if(!ishuman(C))
|
||||
return 0
|
||||
|
||||
return ..()
|
||||
|
||||
Reference in New Issue
Block a user