diff --git a/code/game/objects/items/poi_items.dm b/code/game/objects/items/poi_items.dm index a9e4b876ca..8d11e747f6 100644 --- a/code/game/objects/items/poi_items.dm +++ b/code/game/objects/items/poi_items.dm @@ -18,3 +18,37 @@ /obj/item/poi/pascalb/Destroy() processing_objects -= src return ..() + +/obj/structure/closet/crate/oldreactor + name = "fission reactor rack" + desc = "Used in older models of nuclear reactors, essentially a cooling rack for high volumes of radioactive material." + icon = 'icons/obj/objects.dmi' + icon_state = "poireactor" + icon_opened = "poireactor_open" + icon_closed = "poireactor" + climbable = 0 + +/obj/structure/closet/crate/oldreactor/New() + ..() + new /obj/item/weapon/fuel_assembly/deuterium(src) + new /obj/item/weapon/fuel_assembly/deuterium(src) + new /obj/item/weapon/fuel_assembly/deuterium(src) + new /obj/item/weapon/fuel_assembly/deuterium(src) + new /obj/item/weapon/fuel_assembly/deuterium(src) + new /obj/item/weapon/fuel_assembly/deuterium(src) + +/obj/item/poi/brokenoldreactor + icon_state = "poireactor_broken" + name = "ruptured fission reactor rack" + desc = "This broken hunk of machinery looks extremely dangerous." + +/obj/item/poi/brokenoldreactor/New() + processing_objects += src + return ..() + +/obj/item/poi/brokenoldreactor/process() + radiation_repository.radiate(src, 25) + +/obj/item/poi/brokenoldreactor/Destroy() + processing_objects -= src + return ..() \ No newline at end of file diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index ba8e2003f5..6f739870cc 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -425,3 +425,13 @@ /obj/structure/sign/atmos/air name = "\improper AIR" icon_state = "atmos_air" + +/obj/structure/sign/poi/engineleft + name = "I.C.V." + desc = "The charred name of a cargo ship of some description." + icon_state = "poi_engine1" + +/obj/structure/sign/poi/engineright + name = "I.C.V." + desc = "The charred name of a cargo ship of some description." + icon_state = "poi_engine2" \ No newline at end of file diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index b624395738..6fae3b0bee 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 16235f2158..6973896c3c 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm new file mode 100644 index 0000000000..e782337be3 --- /dev/null +++ b/maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm @@ -0,0 +1,110 @@ +"aa" = (/turf/template_noop,/area/template_noop) +"ab" = (/turf/template_noop,/area/submap/DecoupledEngine) +"ac" = (/obj/item/weapon/fuel_assembly/deuterium,/turf/template_noop,/area/submap/DecoupledEngine) +"ad" = (/obj/structure/flora/tree/sif,/turf/template_noop,/area/submap/DecoupledEngine) +"ae" = (/obj/item/weapon/extinguisher,/turf/template_noop,/area/submap/DecoupledEngine) +"af" = (/obj/item/weapon/material/shard/phoron,/turf/template_noop,/area/submap/DecoupledEngine) +"ag" = (/obj/machinery/power/rad_collector,/turf/template_noop,/area/submap/DecoupledEngine) +"ah" = (/obj/item/weapon/arrow/rod,/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ai" = (/obj/item/stack/material/steel,/turf/template_noop,/area/submap/DecoupledEngine) +"aj" = (/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ak" = (/obj/structure/lattice,/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"al" = (/obj/item/projectile/bullet/magnetic/fuelrod,/turf/template_noop,/area/submap/DecoupledEngine) +"am" = (/obj/item/weapon/arrow/rod,/turf/template_noop,/area/submap/DecoupledEngine) +"an" = (/turf/simulated/floor/water,/area/submap/DecoupledEngine) +"ao" = (/obj/structure/lattice,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ap" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aq" = (/obj/structure/girder,/turf/simulated/floor,/area/submap/DecoupledEngine) +"ar" = (/obj/structure/sign/poi/engineright{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"as" = (/obj/structure/sign/poi/engineleft{dir = 1},/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"at" = (/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"au" = (/obj/structure/lattice,/turf/template_noop,/area/submap/DecoupledEngine) +"av" = (/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) +"aw" = (/obj/structure/girder,/obj/item/stack/material/steel,/turf/simulated/floor,/area/submap/DecoupledEngine) +"ax" = (/obj/structure/lattice,/obj/structure/grille/broken,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ay" = (/obj/effect/floor_decal/rust,/obj/item/stack/material/steel,/turf/simulated/floor,/area/submap/DecoupledEngine) +"az" = (/obj/machinery/atmospherics/pipe/simple/visible{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aA" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aB" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb2,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aC" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (EAST)"; icon_state = "propulsion_r"; dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine) +"aD" = (/obj/structure/lattice,/obj/structure/grille,/turf/template_noop,/area/submap/DecoupledEngine) +"aE" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/template_noop,/area/submap/DecoupledEngine) +"aF" = (/obj/structure/sign/warning/radioactive{dir = 8},/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) +"aG" = (/obj/machinery/fusion_fuel_compressor,/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aH" = (/obj/machinery/fusion_fuel_injector/mapped,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aI" = (/obj/effect/decal/cleanable/blood/oil/streak{amount = 0},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aJ" = (/obj/machinery/power/rad_collector,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 9},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aK" = (/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 5},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aL" = (/obj/structure/grille/broken,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (EAST)"; icon_state = "phoronrwindow"; dir = 4},/obj/item/weapon/material/shard/phoron,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aM" = (/obj/machinery/atmospherics/pipe/manifold4w/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aN" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/obj/effect/floor_decal/rust,/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aO" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_r"; dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine) +"aP" = (/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aQ" = (/obj/machinery/door/airlock/maintenance_hatch{icon_state = "door_closed"; locked = 0; name = "Engine Access"; req_one_access = list(11)},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aR" = (/obj/structure/closet/crate/oldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aS" = (/obj/structure/closet/crate/oldreactor{anchored = 1},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aT" = (/obj/item/poi/brokenoldreactor{anchored = 1},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aU" = (/obj/machinery/atmospherics/pipe/simple/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aV" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (EAST)"; icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (WEST)"; icon_state = "phoronrwindow"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine) +"aW" = (/obj/machinery/atmospherics/pipe/simple/visible{tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aX" = (/obj/structure/shuttle/engine/router,/turf/simulated/floor,/area/submap/DecoupledEngine) +"aY" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/floor/water,/area/submap/DecoupledEngine) +"aZ" = (/obj/item/stack/material/steel,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"ba" = (/obj/item/stack/rods,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"bb" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/turf/template_noop,/area/submap/DecoupledEngine) +"bc" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/template_noop,/area/submap/DecoupledEngine) +"bd" = (/obj/machinery/atmospherics/pipe/tank/carbon_dioxide,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"be" = (/obj/effect/floor_decal/rust,/obj/item/projectile/bullet/magnetic/fuelrod,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bf" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (WEST)"; icon_state = "phoronrwindow"; dir = 8},/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor,/area/submap/DecoupledEngine) +"bg" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bh" = (/obj/machinery/power/rad_collector,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (EAST)"; icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/effect/floor_decal/rust,/obj/effect/floor_decal/industrial/warning{dir = 6},/turf/simulated/floor,/area/submap/DecoupledEngine) +"bi" = (/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"bj" = (/obj/machinery/atmospherics/tvalve/digital{dir = 8},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bk" = (/obj/machinery/atmospherics/binary/pump{dir = 8},/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bl" = (/obj/machinery/atmospherics/pipe/manifold/visible,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bm" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/structure/grille,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (EAST)"; icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (WEST)"; icon_state = "phoronrwindow"; dir = 8},/turf/simulated/floor,/area/submap/DecoupledEngine) +"bn" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 4},/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"bo" = (/obj/effect/floor_decal/rust,/obj/structure/closet/crate/radiation,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bp" = (/obj/effect/decal/cleanable/blood/oil,/obj/effect/floor_decal/rust,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bq" = (/obj/effect/floor_decal/rust,/obj/effect/decal/cleanable/dirt,/obj/item/weapon/rcd,/turf/simulated/floor,/area/submap/DecoupledEngine) +"br" = (/obj/structure/sign/warning/radioactive,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) +"bs" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (NORTH)"; icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (WEST)"; icon_state = "phoronrwindow"; dir = 8},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bt" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (NORTH)"; icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bu" = (/obj/structure/grille,/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (NORTH)"; icon_state = "phoronrwindow"; dir = 1},/obj/structure/window/phoronreinforced{tag = "icon-phoronrwindow (EAST)"; icon_state = "phoronrwindow"; dir = 4},/obj/structure/window/phoronreinforced,/turf/simulated/floor,/area/submap/DecoupledEngine) +"bv" = (/obj/structure/sign/poi/engineleft,/turf/simulated/wall/durasteel,/area/submap/DecoupledEngine) +"bw" = (/obj/structure/sign/poi/engineright,/turf/simulated/wall/r_wall,/area/submap/DecoupledEngine) +"bx" = (/obj/structure/girder,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) +"by" = (/obj/structure/girder/displaced,/turf/simulated/floor/outdoors/rocks,/area/submap/DecoupledEngine) + +(1,1,1) = {" +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaabacababababababababababababababababababababababababababaa +aaabababababababababababababababadababababababababababababaa +aaababababababababababababababababababababababababababababaa +aaabababababababababababababababababababababaeabadababababaa +aaababababababababababababababababababababababababababababaa +aaababababababababababadababababacababababababababababababaa +aaababafabababababababababababababababababababababababababaa +aaabababababababababababababagababababababababababababababaa +aaabababababadabahabababababababababaiabababababababababajaa +aaababababababakababababababababababalababababababababababaa +aaababababababababababababababababababababababababajabajabaa +aaabababaiababababababababababafababababamabajabajababababaa +aaabababababacabababababababajajabababababajanajajajabadabaa +aaabadabafababaoaoaoaoacabaoapaqaqarasatatanananajababababaa +aaamababababauavavavawaxaoapayaqazaAaBaCanananajabababababaa +aaababauauaDaEaFaGaHaIaJaoaKaIaLaMaAaNaOananajajabababababaa +aaababababaPaPaQaPaPaPaRaSaTaUaVaWaNaXaYanajajababababababaa +aaababaZbabbbcavbdbdbebfbgbhaUaVazaNaXbiajajabadabajabababaa +aaabajabajaoaxavaWbjaAaAbkaAblbmaMaAaNbnajabamajabababababaa +aaabababababaoavavavavbobpaPbqavaWayaNaoabajajababababababaa +aaababababababauaoaobrbsbtbuavbvbwauaPajajajabababababababaa +aaabababbxajabababababababababababababababababababababababaa +aaabababababababababababababababamababababababababababababaa +aaabababababababababababababababababajabauababababadabababaa +aaababababababababababaiadabababbyajabababababababababababaa +aaabababababababababababababamababababababababababababababaa +aaababadabababababababababababababababababababababababababaa +aaabababafababababababababababababababababababababababababaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +"} diff --git a/maps/submaps/surface_submaps/wilderness/wilderness.dm b/maps/submaps/surface_submaps/wilderness/wilderness.dm index aa678352a0..2994027070 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness.dm @@ -21,6 +21,7 @@ #include "Rockybase.dmm" #include "MHR.dmm" #include "GovPatrol.dmm" +#include "DecoupledEngine.dmm" #endif @@ -154,7 +155,14 @@ mappath = 'maps/submaps/surface_submaps/wilderness/MHR.dmm' cost = 15 -/datum/map_template/surface/GovPatrol - name = "GovPatrol" +/datum/map_template/surface/wilderness/normal/GovPatrol + name = "Government Patrol" desc = "A long lost SifGuard ground survey patrol. Now they have you guys!" - mappath = 'maps/submaps/surface_submaps/wilderness/GovPatrol.dmm' \ No newline at end of file + mappath = 'maps/submaps/surface_submaps/wilderness/GovPatrol.dmm' + cost = 5 + +/datum/map_template/surface/wilderness/normal/DecoupledEngine + name = "Decoupled Engine" + desc = "A damaged fission engine jettisoned from a starship long ago." + mappath = 'maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm' + cost = 15 \ No newline at end of file diff --git a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm index fece6a2abc..6ef75a21c7 100644 --- a/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm +++ b/maps/submaps/surface_submaps/wilderness/wilderness_areas.dm @@ -61,4 +61,7 @@ name = "Rockybase" /area/submap/GovPatrol - name = "GovPatrol" \ No newline at end of file + name = "GovPatrol" + +/area/submap/DecoupledEngine + name = "DecoupledEngine" \ No newline at end of file