diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 4169ac89ce4..5bd6c81ba20 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -570,7 +570,6 @@ /turf/open/floor/wood, /area/awaymission/wwmines) "cc" = ( -/obj/structure/sign/maltesefalcon/left, /turf/closed/wall/mineral/sandstone, /area/awaymission/wwmines) "cd" = ( @@ -950,7 +949,6 @@ /turf/open/floor/carpet, /area/awaymission/wwmines) "dl" = ( -/obj/structure/sign/maltesefalcon/right, /turf/closed/wall/mineral/sandstone, /area/awaymission/wwmines) "dm" = ( @@ -2107,6 +2105,10 @@ /obj/structure/grille, /turf/open/floor/plasteel, /area/awaymission/wwrefine) +"gH" = ( +/obj/structure/sign/barsign, +/turf/closed/wall/mineral/sandstone, +/area/awaymission/wwmines) "gI" = ( /turf/closed/wall/mineral/titanium/overspace, /area/awaymission/wwrefine) @@ -44747,7 +44749,7 @@ bj bj bj aT -bu +gH bD bj bD @@ -45273,7 +45275,7 @@ bj bj db bj -cc +gH aT bj bj @@ -45530,7 +45532,7 @@ bj bj bj bj -dl +bu aT bj bj diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 535966a09f8..946b2caf509 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -174,10 +174,17 @@ LINEN BINS icon_state = "sheetwiz" item_color = "wiz" +/obj/item/weapon/bedsheet/nanotrasen + name = "nanotrasen bedsheet" + desc = "It has the Nanotrasen logo on it and has an aura of duty." + icon_state = "sheetNT" + item_color = "nanotrasen" + /obj/item/weapon/bedsheet/ian icon_state = "sheetian" item_color = "ian" + /obj/item/weapon/bedsheet/random icon_state = "sheetrainbow" item_color = "rainbow" diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index df5050da450..c0d308d8ffc 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -201,15 +201,10 @@ desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." icon_state = "atmosplaque" -/obj/structure/sign/maltesefalcon //The sign is 64x32, so it needs two tiles. ;3 - name = "The Maltese Falcon" - desc = "The Maltese Falcon, Space Bar and Grill." - -/obj/structure/sign/maltesefalcon/left - icon_state = "maltesefalcon-left" - -/obj/structure/sign/maltesefalcon/right - icon_state = "maltesefalcon-right" +/obj/structure/sign/nanotrasen + name = "\improper NanoTrasen Logo " + desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!" + icon_state = "nanotrasen" /obj/structure/sign/science //These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map name = "\improper SCIENCE" @@ -255,3 +250,5 @@ name = "escape arm" desc = "A direction sign, pointing out which way the escape shuttle dock is." icon_state = "direction_evac" + + diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi index 4827268adf1..17dc5b8fb25 100644 Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 8e39e7b167d..b36bc5900c4 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ