mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-02-05 06:09:08 +00:00
Makes Chicken Man statues in Mr. Chang's into real statues (#13721)
* I think this is ok? * Chicken Man and Kidan statues are now real statues that can be moved and disassembled (disassembly causes them to vanish without dropping materials as there are no bronze or obsidian stacks). Moved their sprites from decorations to statues for consistency. * Oops! Metastation too. * Finally got everything sorted out. Phew! * The OXENbot on the derelict station is no longer a renamed chicken man statue. It can also be unanchored and sliced up for metal should you be inclined to do so. * What even is this? Delete this. * Coding standards * Removed density variables from the changed statues. * Fixes conflicts
This commit is contained in:
@@ -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" = (
|
||||
|
||||
@@ -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" = (
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 31 KiB |
Reference in New Issue
Block a user