diff --git a/aurorastation.dme b/aurorastation.dme index a8ab95b2edb..c765bc23de3 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3338,6 +3338,7 @@ #include "maps\random_ruins\exoplanets\adhomai\adhomai_raskara_ritual.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_raskariim_hideout.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_schlorrgo_cage.dm" +#include "maps\random_ruins\exoplanets\adhomai\adhomai_silo.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_tunneler_nest.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_village.dm" #include "maps\random_ruins\exoplanets\adhomai\adhomai_war_memorial.dm" diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 8f1e002fe21..f0b9d96e8ec 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -25,6 +25,10 @@ anchored = 1 layer = 3 +/obj/effect/decal/fake_object/Initialize(mapload) + .=..() + appearance_flags &= ~TILE_BOUND + /obj/effect/decal/fake_object/light_source name = "light source" icon = 'icons/obj/lighting.dmi' diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index dfc5d92274b..9b9e45be31a 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -144,7 +144,7 @@ /datum/map_template/ruin/exoplanet/adhomai_bar, /datum/map_template/ruin/exoplanet/adhomai_war_memorial, /datum/map_template/ruin/exoplanet/adhomai_raskariim_hideout, /datum/map_template/ruin/exoplanet/adhomai_cavern_geist, /datum/map_template/ruin/exoplanet/adhomai_tunneler_nest, /datum/map_template/ruin/exoplanet/adhomai_rafama_herd, /datum/map_template/ruin/exoplanet/adhomai_abandoned_labor_camp, /datum/map_template/ruin/exoplanet/psis_outpost, /datum/map_template/ruin/exoplanet/pra_base, /datum/map_template/ruin/exoplanet/adhomai_president_hadii_statue, /datum/map_template/ruin/exoplanet/pra_mining_camp, /datum/map_template/ruin/exoplanet/adhomai_nuclear_waste, - /datum/map_template/ruin/exoplanet/adhomai_fallout_bunker, /datum/map_template/ruin/exoplanet/adhomai_schlorrgo_cage) + /datum/map_template/ruin/exoplanet/adhomai_fallout_bunker, /datum/map_template/ruin/exoplanet/adhomai_schlorrgo_cage, /datum/map_template/ruin/exoplanet/adhomai_silo) if("Democratic People's Republic of Adhomai") possible_random_ruins = list (/datum/map_template/ruin/exoplanet/adhomai_hunting, /datum/map_template/ruin/exoplanet/adhomai_minefield, /datum/map_template/ruin/exoplanet/adhomai_village, diff --git a/html/changelogs/alberyk-silo.yml b/html/changelogs/alberyk-silo.yml new file mode 100644 index 00000000000..c5775c53b08 --- /dev/null +++ b/html/changelogs/alberyk-silo.yml @@ -0,0 +1,6 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added a new Adhomian random ruin: the missile silo." diff --git a/icons/effects/missile_silo.dmi b/icons/effects/missile_silo.dmi new file mode 100644 index 00000000000..c1530da4ab6 Binary files /dev/null and b/icons/effects/missile_silo.dmi differ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm new file mode 100644 index 00000000000..7bb84a52f84 --- /dev/null +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -0,0 +1,68 @@ +/datum/map_template/ruin/exoplanet/adhomai_silo + name = "Adhomian Missile Silo" + id = "adhomai_silo" + description = "A heavily guarded Hadiist missile silo." + spawn_weight = 1 + spawn_cost = 2 + sectors = list(SECTOR_SRANDMARR) + suffixes = list("adhomai/adhomai_silo.dmm") + +/area/adhomai_silo + name = "Adhomian Missile Silo" + icon_state = "bluenew" + requires_power = FALSE + dynamic_lighting = TRUE + no_light_control = FALSE + base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai + flags = RAD_SHIELDED + ambience = AMBIENCE_HIGHSEC + +//ghost roles + +/datum/ghostspawner/human/silo_guard + short_name = "silo_guard" + name = "Hadiist Missile Silo Guard" + desc = "Guard the Hadiist missile silo." + tags = list("External") + + spawnpoints = list("silo_guard") + max_count = 1 + + extra_languages = list(LANGUAGE_SIIK_MAAS) + outfit = /datum/outfit/admin/silo_guard + possible_species = list(SPECIES_TAJARA,SPECIES_TAJARA_MSAI) + allow_appearance_change = APPEARANCE_PLASTICSURGERY + + assigned_role = "Hadiist Missile Silo Guard" + special_role = "Hadiist Missile Silo Guard" + respawn_flag = null + + uses_species_whitelist = FALSE + + +/datum/outfit/admin/silo_guard + name = "People's Republic of Adhomai Silo Guard" + + uniform = /obj/item/clothing/under/tajaran/pra_uniform + head = /obj/item/clothing/head/beret/tajaran/pra + suit = /obj/item/clothing/suit/storage/tajaran/pra_jacket/armored + back = /obj/item/gun/projectile/automatic/rifle/adhomian + shoes = /obj/item/clothing/shoes/tajara/combat + belt = /obj/item/storage/belt/military + accessory = /obj/item/clothing/accessory/badge/hadii_card + l_ear = null + + belt_contents = list( + /obj/item/gun/projectile/pistol/adhomai = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/ammo_magazine/boltaction = 3, + /obj/item/melee/baton/stunrod = 1, + /obj/item/handcuffs = 1 + ) + + id = /obj/item/card/id + r_pocket = /obj/item/storage/wallet/random + l_pocket = /obj/item/device/radio + +/datum/outfit/admin/silo_guard/get_id_access() + return list(access_pra) diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm new file mode 100644 index 00000000000..da0b147eb64 --- /dev/null +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm @@ -0,0 +1,1211 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/floor_decal/concrete{ + dir = 10 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"b" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 8 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"c" = ( +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/exoplanet/adhomai) +"d" = ( +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"e" = ( +/obj/machinery/light, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"f" = ( +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"g" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"i" = ( +/turf/simulated/floor/concrete/square, +/area/adhomai_silo) +"j" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"k" = ( +/obj/effect/floor_decal/concrete/large, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"m" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/concrete{ + dir = 10 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"n" = ( +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"o" = ( +/obj/structure/bed/stool/chair/office/dark{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "pra_silo_entry"; + name = "Entry"; + req_access = list(209); + pixel_x = -32 + }, +/obj/effect/floor_decal/concrete{ + dir = 9 + }, +/obj/effect/ghostspawpoint{ + identifier = "silo_guard"; + name = "igs - silo_guard" + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"p" = ( +/obj/effect/floor_decal/concrete{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"s" = ( +/obj/structure/blocker/steel/fence{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/adhomai_silo) +"t" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"v" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 1 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"y" = ( +/obj/effect/floor_decal/concrete{ + dir = 1 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"z" = ( +/obj/effect/floor_decal/concrete{ + dir = 1 + }, +/obj/effect/floor_decal/concrete{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"A" = ( +/obj/effect/floor_decal/concrete{ + dir = 5 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"B" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/concrete{ + dir = 6 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"C" = ( +/obj/structure/window/reinforced{ + dir = 1; + icon_state = "rwindow" + }, +/obj/structure/table/steel, +/obj/item/material/ashtray/bronze, +/obj/item/handcuffs, +/obj/effect/floor_decal/concrete/large{ + dir = 8 + }, +/obj/effect/floor_decal/concrete/large{ + dir = 1 + }, +/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda{ + pixel_y = 8; + pixel_x = 8 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"E" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"F" = ( +/obj/machinery/door/window/brigdoor/northright{ + req_access = list(209) + }, +/obj/structure/table/steel, +/obj/item/paper_bin, +/obj/item/pen/black, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/effect/floor_decal/concrete/large, +/obj/effect/floor_decal/concrete/large{ + dir = 8 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"G" = ( +/obj/effect/floor_decal/concrete/large/cee{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + id = "pra_silo_entry" + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"I" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"K" = ( +/obj/effect/floor_decal/concrete/large, +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/coffee/full, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"M" = ( +/obj/effect/decal/fake_object{ + icon = 'icons/effects/missile_silo.dmi'; + icon_state = "silo"; + pixel_x = -32 + }, +/turf/simulated/floor/concrete/square, +/area/adhomai_silo) +"N" = ( +/obj/effect/floor_decal/concrete{ + dir = 9 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"O" = ( +/obj/effect/floor_decal/concrete{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"R" = ( +/obj/machinery/door/airlock/security{ + name = "Checkpoint"; + req_access = list(209) + }, +/obj/effect/floor_decal/concrete/large/full, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"S" = ( +/obj/effect/floor_decal/concrete/large{ + dir = 4 + }, +/turf/simulated/floor/concrete{ + temperature = 268.15 + }, +/area/pra_base) +"T" = ( +/turf/simulated/wall/concrete, +/area/adhomai_silo) +"U" = ( +/turf/simulated/wall/concrete, +/area/pra_base) +"W" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/concrete, +/area/adhomai_silo) +"Y" = ( +/obj/structure/blocker/steel/fence, +/turf/simulated/floor/exoplanet/snow{ + temperature = 268.15 + }, +/area/adhomai_silo) + +(1,1,1) = {" +c +T +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +T +c +"} +(2,1,1) = {" +c +s +b +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +k +s +c +"} +(3,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(4,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(5,1,1) = {" +c +s +A +f +W +f +f +f +f +f +f +f +f +f +f +W +f +f +f +f +f +f +f +f +f +f +W +a +s +c +"} +(6,1,1) = {" +c +s +A +e +T +I +f +f +f +f +f +f +f +f +e +T +I +f +f +f +f +f +f +f +f +e +T +m +s +c +"} +(7,1,1) = {" +c +s +A +f +t +f +f +f +f +f +f +f +f +f +f +t +f +f +f +f +f +f +f +f +f +f +t +a +s +c +"} +(8,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(9,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(10,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +W +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(11,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +e +T +I +f +f +f +f +f +f +f +f +f +a +s +c +"} +(12,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +t +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(13,1,1) = {" +c +G +z +f +f +f +f +f +f +f +f +f +f +i +i +i +i +i +f +f +f +f +f +W +f +f +f +a +s +c +"} +(14,1,1) = {" +c +s +j +n +d +p +f +f +f +f +W +f +f +i +i +i +i +i +f +f +f +f +e +T +I +f +f +a +s +c +"} +(15,1,1) = {" +c +U +U +U +U +A +f +f +f +e +T +I +f +i +i +M +i +i +f +f +f +f +f +E +f +f +f +a +s +c +"} +(16,1,1) = {" +c +F +o +K +U +O +f +f +f +f +t +f +f +i +i +i +i +i +f +f +f +f +e +T +I +f +f +a +s +c +"} +(17,1,1) = {" +c +C +B +S +R +A +f +f +f +f +f +f +f +i +i +i +i +i +f +f +f +f +f +t +f +f +f +a +s +c +"} +(18,1,1) = {" +c +U +U +U +U +O +f +f +f +f +f +f +f +f +f +f +W +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(19,1,1) = {" +c +s +b +N +N +y +f +f +f +f +f +f +f +f +f +e +T +I +f +f +f +f +f +f +f +f +f +a +s +c +"} +(20,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +t +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(21,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(22,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(23,1,1) = {" +c +s +A +f +W +f +f +f +f +f +f +f +f +f +f +W +f +f +f +f +f +f +f +f +f +f +W +a +s +c +"} +(24,1,1) = {" +c +s +A +e +T +I +f +f +f +f +f +f +f +f +e +T +I +f +f +f +f +f +f +f +f +e +T +m +s +c +"} +(25,1,1) = {" +c +s +A +f +t +f +f +f +f +f +f +f +f +f +f +t +f +f +f +f +f +f +f +f +f +f +t +a +s +c +"} +(26,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(27,1,1) = {" +c +s +A +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +a +s +c +"} +(28,1,1) = {" +c +s +v +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +n +g +s +c +"} +(29,1,1) = {" +c +T +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +T +c +"}