This commit is contained in:
silicons
2022-04-28 04:46:48 -07:00
parent cfc7dd855a
commit caca0f86c3
6 changed files with 27 additions and 26 deletions

View File

@@ -22,7 +22,7 @@
var/intelligence_level = AI_NORMAL // Adjust to make the AI be intentionally dumber, or make it more robust (e.g. dodging grenades). var/intelligence_level = AI_NORMAL // Adjust to make the AI be intentionally dumber, or make it more robust (e.g. dodging grenades).
var/autopilot = FALSE // If true, the AI won't be deactivated if a client gets attached to the AI's mob. var/autopilot = FALSE // If true, the AI won't be deactivated if a client gets attached to the AI's mob.
var/busy = FALSE // If true, the SSticker will skip processing this mob until this is false. Good for if you need the var/busy = FALSE // If true, the SSticker will skip processing this mob until this is false. Good for if you need the
// mob to stay still (e.g. delayed attacking). If you need the mob to be inactive for an extended period of time, // mob to stay still (e.g. delayed attacwking). If you need the mob to be inactive for an extended period of time,
// consider sleeping the AI instead. // consider sleeping the AI instead.

View File

@@ -44,11 +44,12 @@
//mirror should drop on dust //mirror should drop on dust
if(mirror) if(mirror)
mirror.forceMove(drop_location()) mirror.forceMove(drop_location())
mirror = null
if(species) if(species)
..(species.dusted_anim, species.remains_type) return ..(species.dusted_anim, species.remains_type)
else else
..() return ..()
/mob/living/carbon/human/ash() /mob/living/carbon/human/ash()

View File

@@ -42,19 +42,17 @@
buckled.unbuckle_mob(src, TRUE) buckled.unbuckle_mob(src, TRUE)
if(selected_image) if(selected_image)
QDEL_NULL(selected_image) QDEL_NULL(selected_image)
if(LAZYLEN(organs))
organs_by_name.Cut()
while(organs.len)
var/obj/item/OR = organs[1]
organs -= OR
qdel(OR)
if(LAZYLEN(internal_organs)) organs_by_name = null
internal_organs_by_name.Cut() internal_organs_by_name = null
while(internal_organs.len) for(var/obj/item/organ/O in organs)
var/obj/item/OR = internal_organs[1] if(!QDELETED(O))
internal_organs -= OR qdel(O)
qdel(OR) organs = null
for(var/obj/item/organ/O in internal_organs)
if(!QDELETED(O))
qdel(O)
internal_organs = null
return ..() return ..()
//mob verbs are faster than object verbs. See mob/verb/examine. //mob verbs are faster than object verbs. See mob/verb/examine.

View File

@@ -1,12 +1,12 @@
/mob/living/silicon/gib() /mob/living/silicon/gib()
..("gibbed-r") . = ..("gibbed-r")
gibs(loc, null, /obj/effect/gibspawner/robot) gibs(loc, null, /obj/effect/gibspawner/robot)
/mob/living/silicon/dust() /mob/living/silicon/dust()
..("dust-r", /obj/effect/decal/remains/robot) return ..("dust-r", /obj/effect/decal/remains/robot)
/mob/living/silicon/ash() /mob/living/silicon/ash()
..("dust-r") return ..("dust-r")
/mob/living/silicon/death(gibbed,deathmessage) /mob/living/silicon/death(gibbed,deathmessage)
if(in_contents_of(/obj/machinery/recharge_station))//exit the recharge station if(in_contents_of(/obj/machinery/recharge_station))//exit the recharge station

View File

@@ -1,22 +1,24 @@
/mob/living/silicon/robot/dust() /mob/living/silicon/robot/dust()
//Delete the MMI first so that it won't go popping out. //Delete the MMI first so that it won't go popping out.
if(mmi) if(mmi)
qdel(mmi) QDEL_NULL(mmi)
..() return ..()
/mob/living/silicon/robot/ash() /mob/living/silicon/robot/ash()
if(mmi) if(mmi)
qdel(mmi) QDEL_NULL(mmi)
..() return ..()
/mob/living/silicon/robot/death(gibbed) /mob/living/silicon/robot/death(gibbed)
if(camera) if(camera)
camera.status = 0 camera.status = 0
if(module) if(module)
var/obj/item/gripper/G = locate(/obj/item/gripper) in module var/obj/item/gripper/G = locate(/obj/item/gripper) in module
if(G) G.drop_item() if(G)
G.drop_item()
var/obj/item/dogborg/sleeper/S = locate(/obj/item/dogborg/sleeper) in module //VOREStation edit. var/obj/item/dogborg/sleeper/S = locate(/obj/item/dogborg/sleeper) in module //VOREStation edit.
if(S) S.go_out() //VOREStation edit. if(S)
S.go_out() //VOREStation edit.
remove_robot_verbs() remove_robot_verbs()
sql_report_cyborg_death(src) sql_report_cyborg_death(src)
..(gibbed,"shudders violently for a moment, then becomes motionless, its eyes slowly darkening.") return ..(gibbed, "shudders violently for a moment, then becomes motionless, its eyes slowly darkening.")

View File

@@ -59,7 +59,7 @@
living_mob_list -= src living_mob_list -= src
unset_machine() unset_machine()
if(hud_used) if(hud_used)
qdel(hud_used) QDEL_NULL(hud_used)
dispose_rendering() dispose_rendering()
if(client) if(client)
for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters) for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)