diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index e72a32c304d..8f8db032b43 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -222,9 +222,9 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ hologram.name = "[caller_id.name] (Hologram)" hologram.loc = get_step(src,1) masters[caller_id] = hologram - hologram.overlays += getHologramIcon(icon(tempicon)) // Add the callers image as an overlay to keep coloration! + add_overlay(getHologramIcon(icon(tempicon))) // Add the callers image as an overlay to keep coloration! else - hologram.overlays += A.holo_icon // Add the AI's configured holo Icon + add_overlay(A.holo_icon) // Add the AI's configured holo Icon hologram.name = "[A.name] (Hologram)"//If someone decides to right click. A.holo = src masters[A] = hologram diff --git a/code/modules/integrated_electronics/core/helpers.dm b/code/modules/integrated_electronics/core/helpers.dm index 971f7cafaee..e221d0c656f 100644 --- a/code/modules/integrated_electronics/core/helpers.dm +++ b/code/modules/integrated_electronics/core/helpers.dm @@ -20,7 +20,6 @@ /obj/item/integrated_circuit/proc/set_pin_data(pin_type, pin_number, datum/new_data) if (istype(new_data) && !isweakref(new_data)) - PROCLOG_WEIRD("converting hardref to [DEBUG_REF(new_data)] into weakref.") new_data = WEAKREF(new_data) var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 854e48c373d..303cde4b05e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -410,7 +410,13 @@ default behaviour is: /mob/living/proc/restore_all_organs() return - +/mob/living/update_gravity(has_gravity) + if(!ROUND_IS_STARTED) + return + if(has_gravity) + stop_floating() + else + start_floating() /mob/living/proc/revive(reset_to_roundstart = TRUE) // this param is only used in human regen. // Stop killing yourself. Please.