diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index fdc812d1f93..bcbbe8b2351 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -12820,7 +12820,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/chickenstatue, +/obj/structure/statue/chickenstatue, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "awO" = ( @@ -12828,7 +12828,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "awP" = ( -/obj/structure/chickenstatue, +/obj/structure/statue/chickenstatue, /turf/simulated/floor/wood, /area/crew_quarters/mrchangs) "awQ" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 332da829c16..4361bd59785 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -5760,12 +5760,7 @@ /turf/simulated/floor/plasteel, /area/derelict/arrival) "lw" = ( -/obj/structure/chickenstatue{ - desc = "Like a MULEbot, but more Russian and less functional."; - icon = 'icons/obj/aibots.dmi'; - icon_state = "mulebot0"; - name = "OXENbot" - }, +/obj/structure/statue/russian_mulebot, /turf/simulated/floor/plasteel, /area/derelict/arrival) "lx" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 16315eafd6f..c2c11b371a1 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -32677,7 +32677,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) "biQ" = ( -/obj/structure/chickenstatue, +/obj/structure/statue/chickenstatue, /obj/machinery/camera{ c_tag = "Mr. Chang's"; dir = 2; @@ -82398,7 +82398,7 @@ /turf/simulated/floor/carpet, /area/crew_quarters/mrchangs) "cSW" = ( -/obj/structure/chickenstatue, +/obj/structure/statue/chickenstatue, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 80fd69597c4..22449bb547b 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -288,6 +288,28 @@ return setDir(turn(dir, 90)) +/obj/structure/statue/kidanstatue + name = "Obsidian Kidan warrior statue" + desc = "A beautifully carved and menacing statue of a Kidan warrior made out of obsidian. It looks very heavy." + icon_state = "kidan" + anchored = TRUE + oreAmount = 0 + +/obj/structure/statue/chickenstatue + name = "Bronze Chickenman Statue" + desc = "An antique and oriental-looking statue of a Chickenman made of bronze." + icon_state = "chicken" + anchored = TRUE + oreAmount = 0 + +/obj/structure/statue/russian_mulebot + desc = "Like a MULEbot, but more Russian and less functional."; + icon = 'icons/obj/aibots.dmi'; + icon_state = "mulebot0"; + name = "OXENbot" + anchored = TRUE + oreAmount = 10 + //////////////////////////////// /obj/structure/snowman @@ -320,19 +342,3 @@ ..() qdel(src) - -/obj/structure/kidanstatue - name = "Obsidian Kidan warrior statue" - desc = "A beautifully carved and menacing statue of a Kidan warrior made out of obsidian. It looks very heavy." - icon = 'icons/obj/decorations.dmi' - icon_state = "kidanstatue" - anchored = 1 - density = 1 - -/obj/structure/chickenstatue - name = "Bronze Chickenman Statue" - desc = "An antique and oriental-looking statue of a Chickenman made of bronze." - icon = 'icons/obj/decorations.dmi' - icon_state = "chickenstatue" - anchored = 1 - density = 1 diff --git a/icons/obj/decorations.dmi b/icons/obj/decorations.dmi index 8bbfa2e3592..79acc379c39 100644 Binary files a/icons/obj/decorations.dmi and b/icons/obj/decorations.dmi differ diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index bcaddb9f34f..2d9ca959b1b 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ