diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 0ed32826e24..b1b2089f6c3 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -3,7 +3,7 @@ anchored = TRUE opacity = FALSE density = FALSE - layer = 3.5 + layer = NOT_HIGH_OBJ_LAYER max_integrity = 100 armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 2cab7e57907..83043998792 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -327,13 +327,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod, /obj/structure/sign/mining name = "nanotrasen mining corps sign" desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims." - icon = 'icons/turf/walls/survival_pod_walls.dmi' icon_state = "ntpod" + layer = TABLE_LAYER // scuffed but it works /obj/structure/sign/mining/survival name = "shelter sign" desc = "A high visibility sign designating a safe shelter." - icon = 'icons/turf/walls/survival_pod_walls.dmi' icon_state = "survival" //Fluff diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 8c0188175ca..c11cef0cef1 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/paradise.dme b/paradise.dme index 9039bff0f31..2e569021c1d 100644 --- a/paradise.dme +++ b/paradise.dme @@ -698,7 +698,6 @@ #include "code\game\area\areas\ruins\lavaland_areas.dm" #include "code\game\area\areas\ruins\space_areas.dm" #include "code\game\area\areas\ruins\syndicate_space_base_areas.dm" -#include "code\game\area\ss13_areas\station_area.dm" #include "code\game\area\ss13_areas\ai_areas.dm" #include "code\game\area\ss13_areas\command_areas.dm" #include "code\game\area\ss13_areas\engineering_areas.dm" @@ -709,6 +708,7 @@ #include "code\game\area\ss13_areas\science_areas.dm" #include "code\game\area\ss13_areas\security_areas.dm" #include "code\game\area\ss13_areas\service_areas.dm" +#include "code\game\area\ss13_areas\station_area.dm" #include "code\game\area\ss13_areas\supply_areas.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_domutcheck.dm" @@ -2399,8 +2399,8 @@ #include "code\modules\mob\living\simple_animal\hostile\mushroom.dm" #include "code\modules\mob\living\simple_animal\hostile\netherworld.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" -#include "code\modules\mob\living\simple_animal\hostile\soviet.dm" #include "code\modules\mob\living\simple_animal\hostile\skeleton_mob.dm" +#include "code\modules\mob\living\simple_animal\hostile\soviet.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate_mobs.dm" #include "code\modules\mob\living\simple_animal\hostile\tree.dm" #include "code\modules\mob\living\simple_animal\hostile\venus_human_trap.dm"