more fixes

This commit is contained in:
BlackMajor
2023-01-26 21:59:21 +13:00
parent 45dd3bdf59
commit be32183b75
4 changed files with 17 additions and 7 deletions

View File

@@ -561,9 +561,6 @@
if(blob.healing)
blob.healing.expire()
if(blob.l_hand) blob.drop_l_hand()
if(blob.r_hand) blob.drop_r_hand()
if(blob.mob_radio)
blob.mob_radio.forceMove(src)
blob.mob_radio = null
@@ -584,11 +581,14 @@
var/atom/reform_spot = blob.drop_location()
//Size update
resize(blob.size_multiplier, FALSE, ignore_prefs = TRUE)
resize(blob.size_multiplier, 1, 1, ignore_prefs = TRUE)
//Move them back where the blob was
forceMove(reform_spot)
if(blob.l_hand) blob.drop_l_hand()
if(blob.r_hand) blob.drop_r_hand()
//Put our owner in it (don't transfer var/mind)
ckey = blob.ckey
ooc_notes = blob.ooc_notes // Lets give the protean any updated notes from blob form.

View File

@@ -525,7 +525,9 @@
/obj/item/weapon/rig/protean/proc/AssimilateRig(mob/user, var/obj/item/weapon/rig/R)
if(!R || assimilated_rig)
return
to_chat(user, "You assimilate the [R] into the [src]. Mimicking its stats and appearance.")
if(istype(R, /obj/item/weapon/rig/protean))
to_chat(user, "<span class='warning'>The world is not ready for such a technological singularity.</span>")
to_chat(user, "<span class='notice'>You assimilate the [R] into the [src]. Mimicking its stats and appearance.</span>")
for(var/obj/item/piece in list(gloves,helmet,boots,chest))
piece.armor = R.armor.Copy()
piece.max_pressure_protection = R.max_pressure_protection
@@ -567,7 +569,7 @@
piece.armor = armor.Copy()
piece.max_pressure_protection = initial(piece.max_pressure_protection)
piece.max_heat_protection_temperature = initial(piece.max_heat_protection_temperature)
piece.icon_state = initial(piece.icon_state)
piece.icon_state = src.icon_state
piece.icon = initial(piece.icon)
//Byond at this time does not support initial() on lists