You can no longer hide in a mech to avoid gods

This commit is contained in:
Joan Lung
2016-10-10 19:30:40 -04:00
parent 75fe1f07b9
commit d296d7eb78
2 changed files with 34 additions and 2 deletions
+30 -1
View File
@@ -266,4 +266,33 @@
/obj/mecha/mech_melee_attack(obj/mecha/M)
if(M.damtype == BRUTE || M.damtype == BURN)
add_logs(M.occupant, src, "attacked", M, "(INTENT: [uppertext(M.occupant.a_intent)]) (DAMTYPE: [uppertext(M.damtype)])")
. = ..()
. = ..()
/obj/mecha/narsie_act()
if(occupant)
var/mob/living/L = occupant
go_out(TRUE)
if(L)
L.narsie_act()
/obj/mecha/ratvar_act()
if(occupant)
if(is_servant_of_ratvar(occupant)) //reward the minion that got a mech by repairing it
obj_integrity = max_integrity
if(cell)
cell.charge = cell.maxcharge
if(internal_damage & MECHA_INT_FIRE)
clearInternalDamage(MECHA_INT_FIRE)
if(internal_damage & MECHA_INT_TEMP_CONTROL)
clearInternalDamage(MECHA_INT_TEMP_CONTROL)
if(internal_damage & MECHA_INT_SHORT_CIRCUIT)
clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
if(internal_damage & MECHA_INT_TANK_BREACH)
clearInternalDamage(MECHA_INT_TANK_BREACH)
if(internal_damage & MECHA_INT_CONTROL_LOST)
clearInternalDamage(MECHA_INT_CONTROL_LOST)
else
var/mob/living/L = occupant
go_out(TRUE)
if(L)
L.ratvar_act()
+4 -1
View File
@@ -309,7 +309,7 @@
adjustBruteLoss(35)
if(src && reagents)
reagents.add_reagent("heparin", 5)
return 0
return FALSE
if(client)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, null, 0)
else
@@ -324,6 +324,7 @@
new /mob/living/simple_animal/hostile/construct/harvester/hostile(get_turf(src))
spawn_dust()
gib()
return TRUE
/mob/living/ratvar_act()
@@ -333,6 +334,8 @@
if(src)
adjust_fire_stacks(1)
IgniteMob()
return FALSE
return TRUE
//called when the mob receives a bright flash