From 23e95899a67e1bd8994d6ba349e10b6e51e87d0f Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 14 Apr 2020 22:10:53 -0400 Subject: [PATCH] Adds nuclear reactor, Fixes - Adds Nuclear Reactor, 200 kw safe power, very efficient fuel usage. Emits radiation, should be designed around accordingly. - Adds Old point defense batteries which use the old sprite. - Fixes path errors on cruiser.dmm --- code/game/machinery/pointdefense_vr.dm | 2 ++ code/modules/power/port_gen_vr.dm | 11 +++++++++++ maps/tether/submaps/om_ships/cruiser.dmm | 24 +++++++++++++----------- vorestation.dme | 2 ++ 4 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 code/game/machinery/pointdefense_vr.dm create mode 100644 code/modules/power/port_gen_vr.dm diff --git a/code/game/machinery/pointdefense_vr.dm b/code/game/machinery/pointdefense_vr.dm new file mode 100644 index 00000000000..bf096478d95 --- /dev/null +++ b/code/game/machinery/pointdefense_vr.dm @@ -0,0 +1,2 @@ +/obj/machinery/power/pointdefense/old + icon_state = "pointdefense" diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm new file mode 100644 index 00000000000..e6e805e1d77 --- /dev/null +++ b/code/modules/power/port_gen_vr.dm @@ -0,0 +1,11 @@ +/obj/machinery/power/port_gen/pacman/super/potato + name = "nuclear reactor" + desc = "PTTO-3, an industrial all-in-one nuclear power plant by Neo-Chernobyl GmbH. It uses uranium as a fuel source. Rated for 200 kW max safe output." + icon_state = "potato" + time_per_sheet = 1152 //same power output, but a 50 sheet stack will last 4 hours at max safe power + power_gen = 40000 //watts + max_power_output = 5 + max_safe_output = 6 + temperature_gain = 80 //how much the temperature increases per power output level, in degrees per level + max_temperature = 450 + anchored = 1 diff --git a/maps/tether/submaps/om_ships/cruiser.dmm b/maps/tether/submaps/om_ships/cruiser.dmm index b41420ae2fd..65941bfd740 100644 --- a/maps/tether/submaps/om_ships/cruiser.dmm +++ b/maps/tether/submaps/om_ships/cruiser.dmm @@ -2126,19 +2126,19 @@ pixel_x = 4; pixel_y = 26 }, -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; - dir = 4 - }, /obj/structure/cable/cyan{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "eh" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/teleporter) "ei" = ( @@ -2590,8 +2590,7 @@ icon_state = "alarm0"; pixel_y = -22 }, -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; +/obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, @@ -3390,7 +3389,10 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) "gk" = ( -/obj/machinery/power/fractal_reactor/fluff/converter, +/obj/machinery/power/fractal_reactor/fluff/converter{ + mapped_in = 1; + power_generation_rate = 2e+006 + }, /obj/structure/cable, /turf/simulated/floor/tiled/techfloor/grid, /area/mothership/vault) @@ -3417,7 +3419,7 @@ /obj/structure/closet/crate/secure/gear{ req_one_access = list(108) }, -/obj/item/device/subspaceradio, +/obj/item/device/bluespaceradio, /obj/item/weapon/storage/firstaid/insiderepair, /obj/item/weapon/storage/firstaid/combat, /obj/item/weapon/storage/toolbox/syndicate/powertools, @@ -10066,7 +10068,7 @@ /turf/simulated/floor/wood, /area/mothership/breakroom) "uh" = ( -/obj/machinery/pointdefense{ +/obj/machinery/power/pointdefense/old{ id_tag = "warship_pd" }, /turf/simulated/floor/reinforced/airless{ @@ -21425,7 +21427,7 @@ cr QH JJ dP -eh +ex eA eh fd diff --git a/vorestation.dme b/vorestation.dme index a67620c23be..36f512ba15e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -786,6 +786,7 @@ #include "code\game\machinery\partslathe_vr.dm" #include "code\game\machinery\pda_multicaster.dm" #include "code\game\machinery\pointdefense.dm" +#include "code\game\machinery\pointdefense_vr.dm" #include "code\game\machinery\portable_turret.dm" #include "code\game\machinery\portable_turret_vr.dm" #include "code\game\machinery\recharger.dm" @@ -2967,6 +2968,7 @@ #include "code\modules\power\lighting_vr.dm" #include "code\modules\power\lightswitch_vr.dm" #include "code\modules\power\port_gen.dm" +#include "code\modules\power\port_gen_vr.dm" #include "code\modules\power\power.dm" #include "code\modules\power\powernet.dm" #include "code\modules\power\smes.dm"