diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm new file mode 100644 index 00000000000..7d02039454c --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -0,0 +1,58 @@ +"a" = (/turf/open/space,/area/space) +"b" = (/obj/structure/lattice,/turf/open/space,/area/space) +"c" = (/obj/structure/lattice,/turf/open/floor/plating/asteroid/airless,/area/space) +"d" = (/turf/open/floor/plating/asteroid/airless,/area/space) +"e" = (/obj/structure/lattice,/turf/open/floor/plating/airless,/area/space) +"f" = (/turf/closed/wall,/area/ruin/powered/aesthetic) +"g" = (/turf/closed/wall/rust,/area/ruin/powered/aesthetic) +"h" = (/obj/effect/overlay/palmtree_r,/turf/open/floor/holofloor/beach,/area/ruin/powered/aesthetic) +"i" = (/obj/structure/piano,/obj/structure/window{icon_state = "rwindow"; dir = 8},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"j" = (/obj/structure/chair/stool,/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"k" = (/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"l" = (/obj/structure/chair/comfy/black{dir = 4},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"m" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"n" = (/obj/structure/chair/comfy/black{dir = 8},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"o" = (/obj/structure/window{icon_state = "rwindow"; dir = 4},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"p" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/holofloor/beach,/area/ruin/powered/aesthetic) +"q" = (/turf/open/floor/holofloor/beach,/area/ruin/powered/aesthetic) +"r" = (/obj/structure/window{icon_state = "rwindow"; dir = 8},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"s" = (/obj/structure/table/reinforced,/obj/item/clothing/glasses/sunglasses/big{name = "aesthetic sunglasses"},/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"t" = (/obj/item/device/instrument/eguitar,/turf/open/floor/holofloor/beach,/area/ruin/powered/aesthetic) +"u" = (/turf/open/floor/holofloor/beach/coast_t,/area/ruin/powered/aesthetic) +"v" = (/obj/item/weapon/statuebust,/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"w" = (/mob/living/simple_animal/butterfly,/turf/open/floor/plasteel/vaporwave,/area/ruin/powered/aesthetic) +"x" = (/obj/structure/closet/crate/bin,/obj/item/device/tape/random,/turf/open/floor/plating/asteroid/airless,/area/space) +"y" = (/turf/open/floor/holofloor/beach/coast_b,/area/ruin/powered/aesthetic) +"z" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/hatch,/turf/open/floor/pod/dark,/area/ruin/powered/aesthetic) +"A" = (/obj/effect/decal/sandeffect,/turf/open/floor/plating/astplate,/area/space) +"B" = (/turf/open/floor/plating/astplate,/area/space) +"C" = (/turf/open/floor/plating/astplate/warning,/area/space) +"D" = (/turf/open/space,/obj/structure/statue/sandstone/venus{desc = "Ugh, this is merely an ugly amateurish replica of the other statue! The letters RIPGOAT are scribbled onto the base."; dir = 8},/turf/open/floor/plasteel/airless/asteroid{tag = "icon-platingsandeffect"; icon_state = "platingsandeffect"},/area/space) +"E" = (/turf/open/floor/plasteel/airless/asteroid{tag = "icon-recharge_floor_asteroid"; icon_state = "recharge_floor_asteroid"},/area/space) +"F" = (/turf/open/floor/plasteel/airless/asteroid,/area/space) +"G" = (/turf/open/space,/obj/structure/statue/sandstone/venus{dir = 4},/turf/open/floor/plasteel/airless/asteroid{tag = "icon-platingsandeffect"; icon_state = "platingsandeffect"},/area/space) +"H" = (/obj/effect/overlay/palmtree_l,/turf/open/floor/plating/asteroid/airless,/area/space) +"I" = (/turf/open/space,/obj/effect/decal/sandeffect,/turf/open/floor/plasteel/airless/asteroid{tag = "icon-platingsandeffect"; icon_state = "platingsandeffect"},/area/space) +"J" = (/turf/open/floor/plasteel/airless/asteroid{tag = "icon-stairs-l"; icon_state = "stairs-l"},/area/space) +"K" = (/turf/open/floor/plasteel/airless/asteroid{tag = "icon-stairs-m"; icon_state = "stairs-m"},/area/space) +"L" = (/turf/open/floor/plasteel/airless/asteroid{tag = "icon-stairs-r"; icon_state = "stairs-r"},/area/space) +"M" = (/obj/effect/overlay/palmtree_r,/turf/open/floor/plating/asteroid/airless,/area/space) +"N" = (/obj/effect/decal/sandeffect,/turf/open/floor/plasteel/airless/asteroid,/area/space) + +(1,1,1) = {" +aaaaaaaaaaaabaaaaaa +aaaaaabaaaaabaaaaaa +aaaaaccdddddcddaaaa +aaadddeddcccedddaaa +aaddffgfffggfgfdaaa +adddfhijklmnopfddaa +bccegqrkklsnotgecbb +addcghrkkkkkopfcdda +aaddgurvkkkwougxdda +abcefyrkkkkkoygecda +aaddgffffzfgfggddda +aaddABCDEFEGCBAddaa +aaadddHIJKLIMddddaa +aaaadddANFFAdddaaaa +aaaaaadddNNAdaaaaaa +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index cf411f5ebcc..018096d493d 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -269,3 +269,13 @@ teleporter suggests that it was once part of a larger structure, \ but what remains of said structure, if anything, can \ only be guessed at." + +/datum/map_template/ruin/space/vaporwave + id = "vaporwave" + suffix = "vaporwave.dmm" + name = "Aesthetic Outpost" + description = "Pause and remember-- You are unique.\ + You are special. Every mistake, trial, and \ + hardship has helped to sculpt your real \ + beauty. Stop hating yourself and start \ + appreciating and loving yourself!" diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6ac246c864d..0f378284746 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -268,6 +268,17 @@ new /obj/item/weapon/twohanded/required/chainsaw(get_turf(src)) qdel(src) +/obj/item/weapon/statuebust + name = "bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it + icon = 'icons/obj/statue.dmi' + icon_state = "bust" + force = 15 + throwforce = 10 + throw_speed = 5 + throw_range = 2 + attack_verb = list("busted") + /obj/item/weapon/tailclub name = "tail club" desc = "For the beating to death of lizards with their own tails." diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 495b9ca5693..4ea17faf8f6 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -2,7 +2,7 @@ /obj/structure/statue - name = "Statue" + name = "statue" desc = "Placeholder. Yell at Firecage if you SOMEHOW see this." icon = 'icons/obj/statue.dmi' icon_state = "" @@ -153,7 +153,7 @@ var/active = null /obj/structure/statue/uranium/nuke - name = "Statue of a Nuclear Fission Explosive" + name = "statue of a nuclear fission explosive" desc = "This is a grand statue of a Nuclear Explosive. It has a sickening green colour." icon_state = "nuke" @@ -196,7 +196,7 @@ desc = "This statue is suitably made from plasma." /obj/structure/statue/plasma/scientist - name = "Statue of a Scientist" + name = "statue of a scientist" icon_state = "sci" /obj/structure/statue/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) @@ -245,23 +245,23 @@ desc = "This is a highly valuable statue made from gold." /obj/structure/statue/gold/hos - name = "Statue of the Head of Security" + name = "statue of the head of security" icon_state = "hos" /obj/structure/statue/gold/hop - name = "Statue of the Head of Personnel" + name = "statue of the head of personnel" icon_state = "hop" /obj/structure/statue/gold/cmo - name = "Statue of the Chief Medical Officer" + name = "statue of the chief medical officer" icon_state = "cmo" /obj/structure/statue/gold/ce - name = "Statue of the Chief Engineer" + name = "statue of the chief engineer" icon_state = "ce" /obj/structure/statue/gold/rd - name = "Statue of the Research Director" + name = "statue of the research director" icon_state = "rd" //////////////////////////silver/////////////////////////////////////// @@ -272,23 +272,23 @@ desc = "This is a valuable statue made from silver." /obj/structure/statue/silver/md - name = "Statue of a Medical Officer" + name = "statue of a medical officer" icon_state = "md" /obj/structure/statue/silver/janitor - name = "Statue of a Janitor" + name = "statue of a janitor" icon_state = "jani" /obj/structure/statue/silver/sec - name = "Statue of a Security Officer" + name = "statue of a security officer" icon_state = "sec" /obj/structure/statue/silver/secborg - name = "Statue of a Security Cyborg" + name = "statue of a security cyborg" icon_state = "secborg" /obj/structure/statue/silver/medborg - name = "Statue of a Medical Cyborg" + name = "statue of a medical cyborg" icon_state = "medborg" /////////////////////////diamond///////////////////////////////////////// @@ -299,15 +299,15 @@ desc = "This is a very expensive diamond statue" /obj/structure/statue/diamond/captain - name = "Statue of THE Captain." + name = "statue of THE captain." icon_state = "cap" /obj/structure/statue/diamond/ai1 - name = "Statue of the AI hologram." + name = "statue of the AI hologram." icon_state = "ai1" /obj/structure/statue/diamond/ai2 - name = "Statue of the AI core." + name = "statue of the AI core." icon_state = "ai2" ////////////////////////bananium/////////////////////////////////////// @@ -319,7 +319,7 @@ var/spam_flag = 0 /obj/structure/statue/bananium/clown - name = "Statue of a clown" + name = "statue of a clown" icon_state = "clown" /obj/structure/statue/bananium/Bumped(atom/user) @@ -352,10 +352,17 @@ mineralType = "sandstone" /obj/structure/statue/sandstone/assistant - name = "Statue of an assistant" + name = "statue of an assistant" desc = "A cheap statue of sandstone for a greyshirt." icon_state = "assist" + +/obj/structure/statue/sandstone/venus //call me when we add marble i guess + name = "statue of a pure maiden" + 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" + /////////////////////snow///////////////////////////////////////// /obj/structure/statue/snow diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 2ed73c70404..06ba6397f7b 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -370,6 +370,9 @@ icon_state = "cult" name = "engraved floor" +/turf/open/floor/plasteel/vaporwave + icon_state = "pinkblack" + /turf/open/floor/plasteel/goonplaque icon_state = "plaque" name = "Commemorative Plaque" diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index 2cf41c84537..762f65ce1e9 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -53,6 +53,9 @@ /area/ruin/powered/authorship name = "Authorship" +/area/ruin/powered/aesthetic + name = "Aesthetic" + ambientsounds = list('sound/ambience/ambivapor1.ogg') /area/ruin/hotel name = "Hotel" diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index 12bca52881c..0fe4f7f539e 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ diff --git a/icons/obj/statuelarge.dmi b/icons/obj/statuelarge.dmi new file mode 100644 index 00000000000..e45afb8db8a Binary files /dev/null and b/icons/obj/statuelarge.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 18547fed61b..d7590e92c26 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/sound/ambience/ambivapor1.ogg b/sound/ambience/ambivapor1.ogg new file mode 100644 index 00000000000..3ac83daeade Binary files /dev/null and b/sound/ambience/ambivapor1.ogg differ