diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 83166f8c0d..87445a4b38 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -531,7 +531,8 @@
cloak_animation(animation_time)
//Needs to be last so people can actually see the effect before we become invisible
- plane = CLOAKED_PLANE
+ if(cloaked) // Ensure we are still cloaked after the animation delay
+ plane = CLOAKED_PLANE
/atom/movable/proc/uncloak()
if(!cloaked)
@@ -566,7 +567,7 @@
sleep(length+5)
//Remove those
- filters -= filters[our_filter]
+ filters -= filter(type="wave", x = 0, y = 16, size = 8, offset = 1, flags = WAVE_SIDEWAYS)
//Back to original alpha
alpha = initial_alpha
@@ -590,7 +591,7 @@
sleep(length+5)
//Remove those
- filters -= filters[our_filter]
+ filters -= filter(type="wave", x=0, y = 16, size = 0, offset = 0, flags = WAVE_SIDEWAYS)
// So cloaked things can see themselves, if necessary
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index bd9023dc99..ec3ab2f692 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -789,7 +789,7 @@
if(shock(user, 100))
return
- usr.set_machine(src)
+ user.set_machine(src)
var/dat = "Suit Cycler Interface"
@@ -798,7 +798,7 @@
else if(locked)
dat += "
The [model_text ? "[model_text] " : ""]suit cycler is currently locked. Please contact your system administrator."
- if(allowed(usr))
+ if(allowed(user))
dat += "
\[unlock unit\]"
else
dat += "Suit cycler
"
@@ -972,7 +972,7 @@
occupant.loc = get_turf(occupant)
occupant = null
- add_fingerprint(usr)
+ add_fingerprint(user)
updateUsrDialog()
update_icon()
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index f3368b5115..70bc2646a2 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -152,10 +152,10 @@
if(T.type == flooring.build_type)
return
var/obj/item/weapon/W = user.is_holding_item_of_type(/obj/item/weapon)
+ if(!istype(W))
+ return
if(!try_deconstruct_tile(W, user))
return
if(flooring)
return
- if(!istype(W))
- return
attackby(T, user)
\ No newline at end of file
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index af48ffb5fc..547bd87b7e 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -19,6 +19,7 @@
/mob/new_player/New()
mob_list += src
+ initialized = TRUE // Explicitly don't use Initialize(). New players join super early and use New()
/mob/new_player/verb/new_player_panel()
set src = usr
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 0d7767a7be..886dae69e3 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -194,6 +194,8 @@
b_skin = blue
/datum/preferences/proc/dress_preview_mob(var/mob/living/carbon/human/mannequin)
+ if(!mannequin.dna) // Special handling for preview icons before SSAtoms has initailized.
+ mannequin.dna = new /datum/dna(null)
copy_to(mannequin, TRUE)
if(!equip_preview_mob)
diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm
index 20f10e91da..fc78135381 100644
--- a/code/modules/xenoarcheaology/finds/find_spawning.dm
+++ b/code/modules/xenoarcheaology/finds/find_spawning.dm
@@ -674,8 +674,9 @@
if(talkative)
new_item.talking_atom = new(new_item)
- LAZYSET(new_item.origin_tech, TECH_ARCANE, 1)
- LAZYSET(new_item.origin_tech, TECH_PRECURSOR, 1)
+ LAZYINITLIST(new_item.origin_tech)
+ new_item.origin_tech[TECH_ARCANE] += 1
+ new_item.origin_tech[TECH_PRECURSOR] += 1
var/turf/simulated/mineral/T = get_turf(new_item)
if(istype(T))
@@ -685,5 +686,6 @@
else if(talkative)
src.talking_atom = new(src)
- LAZYSET(new_item.origin_tech, TECH_ARCANE, 1)
- LAZYSET(new_item.origin_tech, TECH_PRECURSOR, 1)
+ LAZYINITLIST(origin_tech)
+ origin_tech[TECH_ARCANE] += 1
+ origin_tech[TECH_PRECURSOR] += 1