diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 6157c71ab75..26e39c047b5 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( new /datum/stack_recipe("sandstone airlock assembly", /obj/structure/door_assembly/door_assembly_sandstone, 4, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("sarcophagus", /obj/structure/closet/coffin/sarcophagus, 5, time = 5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), null, - new /datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), null, new /datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = FALSE, on_floor = TRUE), )) @@ -33,11 +33,13 @@ GLOBAL_LIST_INIT(silver_recipes, list ( new /datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20), null, new /datum/stack_recipe_list("silver statues", list( - new /datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Janitor Statue", /obj/structure/statue/silver/janitor, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Sec Officer Statue", /obj/structure/statue/silver/sec, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Sec Borg Statue", /obj/structure/statue/silver/secborg, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Med Doctor Statue", /obj/structure/statue/silver/md, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Med Borg Statue", /obj/structure/statue/silver/medborg, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Monkey Statue", /obj/structure/statue/silver/monkey, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Corgi Statue", /obj/structure/statue/silver/corgi, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )), )) @@ -48,9 +50,9 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( new /datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20), null, new /datum/stack_recipe_list("diamond statues", list( - new /datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Captain Statue", /obj/structure/statue/diamond/captain, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("AI Hologram Statue", /obj/structure/statue/diamond/ai1, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("AI Core Statue", /obj/structure/statue/diamond/ai2, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )), )) @@ -61,8 +63,8 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( new /datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20), null, new /datum/stack_recipe_list("uranium statues", list( - new /datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Nuke Statue", /obj/structure/statue/uranium/nuke, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Engineer Statue", /obj/structure/statue/uranium/eng, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )), )) @@ -73,11 +75,11 @@ GLOBAL_LIST_INIT(gold_recipes, list ( new /datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20), null, new /datum/stack_recipe_list("gold statues", list( - new /datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("HoP Statue", /obj/structure/statue/gold/hop, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("HoS Statue", /obj/structure/statue/gold/hos, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("HoP Statue", /obj/structure/statue/gold/hop, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("CE Statue", /obj/structure/statue/gold/ce, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("RD Statue", /obj/structure/statue/gold/rd, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("CMO Statue", /obj/structure/statue/gold/cmo, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )), null, new /datum/stack_recipe("Simple Crown", /obj/item/clothing/head/crown, 5), @@ -90,8 +92,8 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( new /datum/stack_recipe/dangerous("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20), null, new /datum/stack_recipe_list("plasma statues", list( - new /datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, one_per_turf = TRUE, on_floor = TRUE), - new /datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe/dangerous("Scientist Statue", /obj/structure/statue/plasma/scientist, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe/dangerous("Xenomorph Statue", /obj/structure/statue/plasma/xeno, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )), )) @@ -100,7 +102,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( null, new /datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), null, - new /datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), null, new /datum/stack_recipe("bananium grenade casing", /obj/item/grenade/bananade/casing, 4, on_floor = TRUE), )) @@ -112,7 +114,7 @@ GLOBAL_LIST_INIT(tranquillite_recipes, list ( null, new /datum/stack_recipe("silent tile", /obj/item/stack/tile/mineral/tranquillite, 1, 4, 20), null, - new /datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("Mime Statue", /obj/structure/statue/tranquillite/mime, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )) GLOBAL_LIST_INIT(abductor_recipes, list ( @@ -129,7 +131,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list( )) GLOBAL_LIST_INIT(snow_recipes, list( - new /datum/stack_recipe("snowman", /obj/structure/snowman, 5, one_per_turf = TRUE, on_floor = TRUE), + new /datum/stack_recipe("snowman", /obj/structure/snowman, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), new /datum/stack_recipe("Snowball", /obj/item/snowball, 1) )) @@ -393,6 +395,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list( GLOBAL_LIST_INIT(plastitanium_recipes, list( new /datum/stack_recipe("plas-titanium tile", /obj/item/stack/tile/mineral/plastitanium, 1, 4, 20), + new /datum/stack_recipe("Kidan Warrior Statue", /obj/structure/statue/plastitanium/kidanstatue, 5, time = 2.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE), )) /obj/item/stack/sheet/mineral/plastitanium/New(loc, amount=null) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 89b52fbe178..3423577543d 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -203,6 +203,14 @@ name = "statue of a medical cyborg" icon_state = "medborg" +/obj/structure/statue/silver/corgi + name = "statue of a corgi" + icon_state = "corgi" + +/obj/structure/statue/silver/monkey + name = "statue of a monkey" + icon_state = "monkey" + /obj/structure/statue/diamond max_integrity = 1000 material_drop_type = /obj/item/stack/sheet/mineral/diamond @@ -263,6 +271,7 @@ desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though." icon = 'icons/obj/statuelarge.dmi' icon_state = "venus" + oreAmount = 20 /obj/structure/statue/tranquillite max_integrity = 300 @@ -284,25 +293,27 @@ 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." +/obj/structure/statue/plastitanium + max_integrity = 600 + material_drop_type = /obj/item/stack/sheet/mineral/plastitanium + +/obj/structure/statue/plastitanium/kidanstatue + name = "kidan warrior statue" + desc = "A beautifully carved and menacing statue of a Kidan warrior made out of plastitanium. It looks very heavy." icon_state = "kidan" - anchored = TRUE - oreAmount = 0 /obj/structure/statue/chickenstatue - name = "Bronze Chickenman Statue" + 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 + name = "OXENbot" desc = "Like a MULEbot, but more Russian and less functional."; icon = 'icons/obj/aibots.dmi'; icon_state = "mulebot0"; - name = "OXENbot" anchored = TRUE oreAmount = 10 diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index 2d9ca959b1b..3c6ae708172 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ