mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +01:00
@@ -280,20 +280,6 @@
|
||||
return
|
||||
..()
|
||||
|
||||
/mob/living/silicon/robot/drone/Bump(var/atom/movable/AM, yes)
|
||||
|
||||
if(istype(AM,/obj/machinery/door)) // check for doors first as that will be most common
|
||||
return ..(AM,yes)
|
||||
|
||||
if(!(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)))
|
||||
if(istype(AM,/obj/item)) //Would this even be possible? Someone try to activate that message
|
||||
var/obj/item/O = AM
|
||||
if(O.w_class > can_pull_size)
|
||||
src << "<span class='warning'>You are too small to push that.</span>"
|
||||
return 0
|
||||
else if(istype(AM,/obj))
|
||||
return 0
|
||||
..(AM,yes)
|
||||
|
||||
/mob/living/silicon/robot/drone/add_robot_verbs()
|
||||
src.verbs |= silicon_subsystems
|
||||
|
||||
@@ -678,7 +678,7 @@
|
||||
|
||||
|
||||
else
|
||||
if( !(istype(W, /obj/item/device/robotanalyzer) || istype(W, /obj/item/device/healthanalyzer)) )
|
||||
if(W.force && !(istype(W, /obj/item/device/robotanalyzer) || istype(W, /obj/item/device/healthanalyzer)) )
|
||||
spark_system.start()
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -1072,7 +1072,13 @@ var/list/wierd_mobs_inclusive = list( /mob/living/simple_animal/construct,
|
||||
)
|
||||
|
||||
|
||||
/mob/living/proc/find_type()
|
||||
/mob/proc/find_type()
|
||||
if (istype(src, /mob/living))
|
||||
var/mob/living/L = src
|
||||
return L.find_type()
|
||||
return 0
|
||||
|
||||
/mob/living/find_type()
|
||||
//This function returns a bitfield indicating what type(s) the passed mob is.
|
||||
//Synthetic and wierd are exclusive from organic. We assume it's organic if it's not either of those
|
||||
//var/mob/living/test = src
|
||||
|
||||
Reference in New Issue
Block a user