mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
Fixes proteans being a bit too liberal with reformation
This commit is contained in:
@@ -187,7 +187,7 @@
|
||||
return humanform.adjustOxyLoss(amount)
|
||||
else
|
||||
return ..()
|
||||
|
||||
|
||||
/mob/living/simple_mob/protean_blob/adjustHalLoss(amount)
|
||||
if(humanform)
|
||||
return humanform.adjustHalLoss(amount)
|
||||
@@ -230,7 +230,7 @@
|
||||
else
|
||||
animate(src, alpha = 0, time = 2 SECONDS)
|
||||
sleep(2 SECONDS)
|
||||
|
||||
|
||||
if(!QDELETED(src)) // Human's handle death should have taken us, but maybe we were adminspawned or something without a human counterpart
|
||||
qdel(src)
|
||||
|
||||
@@ -380,7 +380,7 @@ var/global/list/disallowed_protean_accessories = list(
|
||||
var/obj/belly/B = belly
|
||||
B.forceMove(blob)
|
||||
B.owner = blob
|
||||
|
||||
|
||||
//We can still speak our languages!
|
||||
blob.languages = languages.Copy()
|
||||
|
||||
@@ -402,10 +402,14 @@ var/global/list/disallowed_protean_accessories = list(
|
||||
if(!istype(blob))
|
||||
return
|
||||
|
||||
if(istype(blob.loc, /obj/machinery/atmospherics))
|
||||
to_chat(src, "You cannot reform in these confines!")
|
||||
return
|
||||
|
||||
var/panel_was_up = FALSE
|
||||
if(client?.statpanel == "Protean")
|
||||
panel_was_up = TRUE
|
||||
|
||||
|
||||
if(buckled)
|
||||
buckled.unbuckle_mob()
|
||||
if(LAZYLEN(buckled_mobs))
|
||||
|
||||
Reference in New Issue
Block a user