diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm index e79f0e209a2..e07cc7a2107 100644 --- a/code/defines/obj/clothing/mask.dm +++ b/code/defines/obj/clothing/mask.dm @@ -35,7 +35,7 @@ name = "Deadpool mask" icon_state = "spiderman" item_state = "spiderman" - flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH + flags = FPRINT|TABLEPASS|SUITSPACE|HEADSPACE|MASKCOVERSMOUTH|BLOCKHAIR w_class = 3 protective_temperature = 420 gas_transfer_coefficient = 0.01 diff --git a/code/game/dna.dm b/code/game/dna.dm index 77f10dbb5d7..2aa3dd8c510 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -597,7 +597,7 @@ if (!M.client) for(var/mob/dead/observer/ghost in world) if(ghost.corpse == M && ghost.client) - ghost << "Your corpse has been placed into a cloning scanner. Return to your body if you want to be ressurected/cloned! (Verbs -> Ghost -> Re-enter corpse)" + ghost << "Your corpse has been placed into a cloning scanner. Return to your body if you want to be ressurected/cloned! (Verbs -> Ghost -> Re-enter corpse)" break del(G) return diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index 1f1b79a4697..36183d6f889 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -641,7 +641,8 @@ datum var/x_distance = TO.x - FROM.x for (var/atom/movable/A in range(2, FROM )) // iterate thru list of mobs in the area if(istype(A, /obj/item/device/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid - if(A.anchored) continue // don't teleport anchored things (computers, tables, windows, grilles, etc) because this causes problems! + if( A.anchored && !istype(A, /mob/dead/observer) ) continue // don't teleport anchored things (computers, tables, windows, grilles, etc) because this causes problems! + // do teleport ghosts however because hell why not var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 5d17691987e..1b18fd93d55 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -264,6 +264,8 @@ datum/preferences h_style_r = "hair_vlong" if("Jensen Hair") h_style_r = "hair_jensen" + if("Skinhead") + h_style_r = "hair_skinhead" else h_style_r = "bald" diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 5069ddd2766..6831a6c8c13 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ