diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index b17a1170a35..9fba7c14a1b 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -63,7 +63,8 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), \ new/datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("AI Statue", /obj/structure/statue/diamond/ai, 5, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/mineral/diamond/New(var/loc, var/amount=null) @@ -119,7 +120,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), \ new/datum/stack_recipe("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Xeno Statue", /obj/structure/statue/plasma/xenomorph, 5, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/mineral/plasma/New(var/loc, var/amount=null) @@ -178,10 +178,10 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), \ new/datum/stack_recipe("Med Officer Statue", /obj/structure/statue/silver/md, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Chemist Statue", /obj/structure/statue/silver/chem, 5, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/borgs, 5, one_per_turf = 1, on_floor = 1), \ - new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/borgm, 5, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/mineral/silver/New(var/loc, var/amount=null) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index a6542254b43..7107b025a82 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -124,16 +124,11 @@ /obj/structure/statue/plasma hardness = 2 mineralType = "plasma" + desc = "This statue is suitably made from plasma." /obj/structure/statue/plasma/scientist name = "Statue of a Scientist" - desc = "This statue is suitably made from plasma." - icon_state = "scientist" - -/obj/structure/statue/plasma/xenomorph - name = "Statue of a Xenomorph" - desc = "This statue is suitably made from plasma." - icon_state = "xenomorph" + icon_state = "sci" /obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) if(exposed_temperature > 300) @@ -168,30 +163,26 @@ /obj/structure/statue/gold hardness = 3 mineralType = "gold" + desc = "This is a highly valuable statue made from gold." /obj/structure/statue/gold/hos name = "Statue of the Head of Security" - desc = "This is a highly valuable statue made from gold." icon_state = "hos" /obj/structure/statue/gold/hop name = "Statue of the Head of Personnel" - desc = "This is a highly valuable statue made from gold." icon_state = "hop" /obj/structure/statue/gold/cmo name = "Statue of the Chief Medical Officer" - desc = "This is a highly valuable statue made from gold." icon_state = "cmo" /obj/structure/statue/gold/ce name = "Statue of the Chief Engineer" - desc = "This is a highly valuable statue made from gold." icon_state = "ce" /obj/structure/statue/gold/rd name = "Statue of the Research Director" - desc = "This is a highly valuable statue made from gold." icon_state = "rd" //////////////////////////silver/////////////////////////////////////// @@ -199,57 +190,56 @@ /obj/structure/statue/silver hardness = 3 mineralType = "silver" + desc = "This is a valuable statue made from silver." /obj/structure/statue/silver/md name = "Statue of a Medical Officer" - desc = "This is a valuable statue made from silver." icon_state = "md" -/obj/structure/statue/silver/chem - name = "Statue of a Chemist" - desc = "This is a valuable statue made from silver." - icon_state = "chem" +/obj/structure/statue/silver/janitor + name = "Statue of a Janitor" + icon_state = "jani" /obj/structure/statue/silver/sec name = "Statue of a Security Officer" - desc = "This is a valuable statue made from silver." icon_state = "sec" -/obj/structure/statue/silver/borgs +/obj/structure/statue/silver/secborg name = "Statue of a Security Cyborg" - desc = "This is a valuable statue made from silver." - icon_state = "borgs" + icon_state = "secborg" -/obj/structure/statue/silver/borgm +/obj/structure/statue/silver/medborg name = "Statue of a Medical Cyborg" - desc = "This is a valuable statue made from silver." - icon_state = "borgm" + icon_state = "medborg" /////////////////////////diamond///////////////////////////////////////// /obj/structure/statue/diamond hardness = 10 mineralType = "diamond" + desc = "This is a very expensive diamond statue" /obj/structure/statue/diamond/captain name = "Statue of THE Captain." - desc = "This is a very expensive diamond statue" - icon_state = "captain" + icon_state = "cap" -/obj/structure/statue/diamond/ai - name = "Statue of the AI." - desc = "This is a very expensive diamond statue" - icon_state = "ai" +/obj/structure/statue/diamond/ai1 + name = "Statue of the AI hologram." + icon_state = "ai1" + +/obj/structure/statue/diamond/ai2 + name = "Statue of the AI core." + icon_state = "ai2" ////////////////////////bananium/////////////////////////////////////// /obj/structure/statue/bananium hardness = 3 mineralType = "clown" + desc = "A bananium statue with a small engraving:'HOOOOOOONK'." /obj/structure/statue/bananium/clown name = "Statue of a clown" - desc = "A bananium statue with a small engraving:'HOOOOOOONK'." icon_state = "clown" /obj/structure/statue/bananium/Bumped(atom/user) @@ -282,4 +272,4 @@ /obj/structure/statue/sandstone/assistant name = "Statue of an assistant" desc = "A cheap statue of sandstone for a greyshirt." - icon_state = "assistant" + icon_state = "assist" diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index 0f2b49d3a9f..e598551ae84 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ