diff --git a/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm b/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm index 91f1e17fbc5..7619e6782a4 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/coilgun.dm @@ -1,7 +1,7 @@ /obj/machinery/ship_weapon/coilgun - name = "type 21 nadziak solarian coilgun" - desc = "The venerable Nadziak-class line of coilguns was born in the fires of the Interstellar War, where its ability to shred shields and low-class hulls have ensured its immortality in the infrastructure of the Solarian Navy." - desc_extended = "Although originally an expensive blunder made by over-worked Kumar Arms designers, the Nadziak later preformed to an outstanding degree following numerous improvements. Its fame among post-War Admirals was such that its name and purpose has largely remained the same, with a new 'Type' iteration commissioned every decade or so. With the expulsion of Zavodskoi and its subsidiary from Solarian space, this aging giant and symbol of military might is under threat of being consumed by the resulting arms manufacturing vacuum." + name = "M55A2 Coilgun" + desc = "A venerable mainstay of the Solarian Navy's arsenal and the prime reason of why Issac Newton is still the deadliest human in the Spur. The M55A2 is capable of firing rifled tungsten rods the size of flagpoles at supersonic speeds. Despite it's lackluster performance against a well-armored ship of the line, it's ability to seriously damage any smaller vessel with a few well-aimed shots has earned the platform's ubiqutous status in the Alliance's 100 fleets." + desc_extended = "Originally desgined just before the outbreak of the Interstellar War, the M55 series of Intermediate Coilgun have seen extensive service from the battles over Gadpathur and Xanu to the actions of the First invasion of Tau Ceti with the M55A1. However, in spite of the A1 variant's significant advancements in percision and ease of use, the M55's greatest hour was arguably in the discord and chaos of the Solarian Civil War. With the faster-firing and much easier to produce M55A2 being used by all sides of the conflict. Tried and tested on the warlord-infested ruins of Southern Sol and over the smoldering battlefields of San Colette, the M55A2 still remains the 'workhorse gun' of the Solarian Navy to this day. It is mostly used as a primary armament (either on turret mounts or fixed in fore-facing casemates) aboard escort vessels. And on secondary turret mounts aboard a ship of the line. " icon = 'icons/obj/machinery/ship_guns/sol_coilgun.dmi' icon_state = "weapon_base" projectile_type = /obj/projectile/ship_ammo/coilgun @@ -14,19 +14,19 @@ /obj/item/ship_ammunition/coilgun name = "tungsten rod pack" name_override = "tungsten rod" - desc = "A pack of rods used as ammunition for a coilgun." + desc = "A pack of rods used as ammunition for the M55A2 intermediate coilgun, if the obvious labelling and handling insturctions didn't already give it away." icon = 'icons/obj/ammo.dmi' icon_state = "trodpack-2" caliber = SHIP_CALIBER_COILGUN overmap_icon_state = "cannon" - impact_type = SHIP_AMMO_IMPACT_HE + impact_type = SHIP_AMMO_IMPACT_BUNKERBUSTER /obj/projectile/ship_ammo/coilgun name = "high-power tungsten rod" icon_state = "heavy" damage = 10000 armor_penetration = 1000 - penetrating = 1 + penetrating = 50 /obj/projectile/ship_ammo/coilgun/on_hit(atom/target, blocked, def_zone, is_landmark_hit) . = ..() @@ -34,7 +34,7 @@ var/mob/M = target M.visible_message(SPAN_DANGER("\The [src] blows [M]'s chest apart and punches straight through!")) if(isturf(target) || isobj(target)) - explosion(target, 6, 8, 10) + explosion(target, 1, 5, 3) /obj/machinery/ammunition_loader/sol icon_state = "ammo_loader_sol" diff --git a/html/changelogs/Mynameasjeff-PR-21604.yml b/html/changelogs/Mynameasjeff-PR-21604.yml new file mode 100644 index 00000000000..edacd243c63 --- /dev/null +++ b/html/changelogs/Mynameasjeff-PR-21604.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Mynameasjeff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - refactor: "Reworks the Solarian Coilgun into a event-only weapon no longer" + - bugfix: "Fixes several issues found on the Solarian Frigate during playtesting" + - balance: "Replaces the Solarian Frigate's longbow with the new coilgun. Hoorah!" diff --git a/maps/away/ships/sol/sol_frigate/sol_frigate.dmm b/maps/away/ships/sol/sol_frigate/sol_frigate.dmm index fb58ba4b726..845914c8397 100644 --- a/maps/away/ships/sol/sol_frigate/sol_frigate.dmm +++ b/maps/away/ships/sol/sol_frigate/sol_frigate.dmm @@ -266,6 +266,9 @@ /obj/machinery/door/airlock/external{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 8 + }, /obj/machinery/access_button{ pixel_x = 27; pixel_y = 25 @@ -666,8 +669,13 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/cic) "di" = ( -/obj/effect/floor_decal/industrial/hatch, -/turf/simulated/floor/tiled/dark, +/obj/structure/ship_weapon_dummy/barrel, +/obj/machinery/ship_weapon/coilgun{ + pixel_y = -34; + weapon_id = "Starboard_Coilgun"; + pixel_x = -31 + }, +/turf/simulated/floor/reinforced, /area/ship/sol_frigate/port_battery) "dj" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -765,6 +773,7 @@ req_access = list(222) }, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, /turf/simulated/floor/plating, /area/ship/sol_frigate/hangar) "dv" = ( @@ -1103,6 +1112,16 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/safe_room) +"eO" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch, +/turf/simulated/floor/tiled/dark, +/area/ship/sol_frigate/port_battery) "eR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1162,15 +1181,12 @@ /area/ship/sol_frigate/hallway_fore) "fg" = ( /obj/structure/table/rack, -/obj/item/warhead/longbow, -/obj/item/warhead/longbow, -/obj/item/warhead/longbow, -/obj/item/warhead/longbow/ap, -/obj/item/warhead/longbow/ap, -/obj/item/warhead/longbow/ap, /obj/effect/floor_decal/corner/red{ dir = 6 }, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) "fi" = ( @@ -1354,11 +1370,11 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/starboard_battery) "fN" = ( -/obj/machinery/ammunition_loader/longbow{ - weapon_id = "Sol Frigate Longbow" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, /turf/simulated/floor/tiled/dark, -/area/ship/sol_frigate/port_battery) +/area/ship/sol_frigate/starboard_thrusters) "fO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -1460,7 +1476,7 @@ /obj/structure/rod_railing{ dir = 4 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/plating, /area/shuttle/solfrig_shuttle) "gE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1674,18 +1690,15 @@ /area/ship/sol_frigate/cic) "hz" = ( /obj/structure/table/rack, -/obj/item/ship_ammunition/longbow, -/obj/item/ship_ammunition/longbow, -/obj/item/ship_ammunition/longbow, -/obj/item/ship_ammunition/longbow, -/obj/item/ship_ammunition/longbow, -/obj/item/ship_ammunition/longbow, /obj/effect/floor_decal/corner/red{ dir = 6 }, /obj/effect/floor_decal/corner/red{ dir = 5 }, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) "hA" = ( @@ -1904,7 +1917,7 @@ "ix" = ( /obj/effect/floor_decal/sol, /turf/simulated/floor/airless, -/area/ship/sol_frigate/exterior) +/area/space) "iA" = ( /obj/structure/table/reinforced, /obj/item/device/binoculars, @@ -2315,6 +2328,7 @@ /area/ship/sol_frigate/Starboard_docking_port) "kj" = ( /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/manifold/hidden/black, /obj/effect/floor_decal/industrial/outline/service, /obj/machinery/light/small, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ @@ -2342,6 +2356,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/hangar) "kl" = ( @@ -2710,6 +2725,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/hangar) "mj" = ( @@ -3021,11 +3040,11 @@ /turf/simulated/floor/tiled/white, /area/ship/sol_frigate/canteen) "nE" = ( -/obj/machinery/computer/ship/helm/terminal{ +/obj/effect/floor_decal/industrial/outline/security, +/obj/machinery/computer/ship/sensors/terminal{ dir = 1; req_access = list(203) }, -/obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/cic) "nF" = ( @@ -3329,6 +3348,7 @@ /obj/machinery/door/airlock/external, /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/hangar) "oP" = ( @@ -3410,7 +3430,7 @@ /obj/structure/ship_weapon_dummy{ opacity = 1 }, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced, /area/ship/sol_frigate/port_battery) "ph" = ( /obj/machinery/light{ @@ -3672,11 +3692,10 @@ }, /area/ship/sol_frigate/freezer) "qp" = ( -/obj/structure/viewport, /obj/effect/landmark/entry_point/fore{ name = "fore, main gunnery" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/shuttle/raider, /area/ship/sol_frigate/port_battery) "qq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -3828,11 +3847,12 @@ /area/ship/sol_frigate/head) "rl" = ( /obj/structure/lattice/catwalk, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/space/dynamic, +/area/space) "rn" = ( -/turf/template_noop, -/area/ship/sol_frigate/exterior) +/obj/structure/lattice/catwalk, +/turf/space/dynamic, +/area/ship/sol_frigate/hangar) "ro" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide, /obj/effect/floor_decal/corner/orange{ @@ -3917,7 +3937,7 @@ /area/ship/sol_frigate/bunks) "rJ" = ( /obj/structure/ship_weapon_dummy, -/turf/simulated/floor/reinforced/airless, +/turf/simulated/floor/reinforced, /area/ship/sol_frigate/port_battery) "rM" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -4104,9 +4124,6 @@ /obj/effect/floor_decal/corner/orange{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/starboard_thrusters) "sV" = ( @@ -4249,6 +4266,7 @@ id = "SFLD" }, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, /turf/simulated/floor/plating, /area/ship/sol_frigate/hangar) "tB" = ( @@ -4347,8 +4365,8 @@ "tS" = ( /obj/item/hullbeacon/red, /obj/structure/lattice, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/template_noop, +/area/space) "tT" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -4626,7 +4644,7 @@ "uG" = ( /obj/effect/floor_decal/big/sol_full, /turf/simulated/floor/airless, -/area/ship/sol_frigate/exterior) +/area/space) "uH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -4898,7 +4916,7 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/canteen) "wd" = ( -/turf/simulated/floor/reinforced/airless, +/turf/template_noop, /area/ship/sol_frigate/port_battery) "we" = ( /turf/simulated/wall/shuttle/raider, @@ -4998,11 +5016,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/sol_frigate/canteen) -"wJ" = ( -/obj/effect/step_trigger/teleporter, -/obj/effect/step_trigger/teleporter, -/turf/space, -/area/space) "wL" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -5010,8 +5023,9 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/hallway_mid) "wM" = ( +/obj/effect/map_effect/perma_light/brighter, /turf/simulated/floor/airless, -/area/ship/sol_frigate/exterior) +/area/space) "wO" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/power/apc/south, @@ -5099,9 +5113,8 @@ /turf/simulated/wall/shuttle/raider, /area/ship/sol_frigate/port_battery) "xs" = ( -/obj/effect/map_effect/perma_light/brighter, /turf/simulated/floor/airless, -/area/ship/sol_frigate/exterior) +/area/space) "xy" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -5403,6 +5416,13 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/hallway_mid) +"zx" = ( +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/sol_frigate/hangar) "zy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -5478,7 +5498,7 @@ /area/ship/sol_frigate/port_thrusters) "zM" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ - dir = 1; + dir = 4; frequency = 1534; id_tag = "xanufrigate_portco2_out" }, @@ -5643,8 +5663,8 @@ "At" = ( /obj/structure/lattice/catwalk, /obj/item/hullbeacon/green, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/space/dynamic, +/area/ship/sol_frigate/hangar) "Az" = ( /obj/machinery/airlock_sensor{ pixel_y = -25; @@ -5898,6 +5918,9 @@ /obj/structure/cable/blue{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/starboard_thrusters) "Bu" = ( @@ -6268,6 +6291,13 @@ }, /turf/simulated/floor/tiled/white, /area/ship/sol_frigate/sickbay) +"Db" = ( +/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/sol_frigate/starboard_thrusters) "Dc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6279,6 +6309,9 @@ /obj/machinery/door/airlock/external{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, @@ -6781,10 +6814,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/engineering) -"FX" = ( -/obj/effect/step_trigger/teleporter, -/turf/space, -/area/space) "FY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7333,8 +7362,8 @@ "Ii" = ( /obj/structure/lattice, /obj/item/hullbeacon/red, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/template_noop, +/area/space) "Ij" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, mess hall" @@ -8041,7 +8070,7 @@ /obj/structure/rod_railing{ dir = 8 }, -/turf/simulated/floor/airless, +/turf/simulated/floor/plating, /area/shuttle/solfrig_shuttle) "Lf" = ( /obj/effect/landmark/entry_point/aft, @@ -8269,7 +8298,10 @@ /area/ship/sol_frigate/brig) "LJ" = ( /obj/effect/floor_decal/industrial/hatch/operations, -/turf/simulated/floor/tiled/dark/full/airless, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, /area/ship/sol_frigate/Port_docking_port) "LK" = ( /obj/machinery/light, @@ -8335,6 +8367,9 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, +/obj/machinery/ammunition_loader/sol{ + weapon_id = "Starboard_Coilgun" + }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) "Mb" = ( @@ -8552,6 +8587,9 @@ /obj/effect/floor_decal/corner/red{ dir = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) "Nv" = ( @@ -8796,18 +8834,15 @@ /area/ship/sol_frigate/cic) "Ou" = ( /obj/structure/table/rack, -/obj/item/primer, -/obj/item/primer, -/obj/item/primer, -/obj/item/primer, -/obj/item/primer, -/obj/item/primer, /obj/machinery/light{ dir = 4 }, /obj/effect/floor_decal/corner/red{ dir = 6 }, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, +/obj/item/ship_ammunition/coilgun, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) "Ow" = ( @@ -8978,6 +9013,7 @@ id = "SFLD" }, /obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/map_effect/marker/airlock/docking/Sol_frigate/shuttle_port, /turf/simulated/floor/plating, /area/ship/sol_frigate/hangar) "Pj" = ( @@ -9105,8 +9141,8 @@ /area/ship/sol_frigate/head) "Qd" = ( /obj/structure/lattice, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/template_noop, +/area/space) "Qg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -9214,8 +9250,6 @@ dir = 9 }, /obj/machinery/alarm/west, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/pipe_meter, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/starboard_thrusters) "QC" = ( @@ -9241,17 +9275,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/port_battery) -"QP" = ( -/obj/machinery/ship_weapon/longbow{ - pixel_x = -32; - pixel_y = -320; - weapon_id = "Sol Frigate Longbow" - }, -/obj/structure/ship_weapon_dummy{ - opacity = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/ship/sol_frigate/port_battery) "QQ" = ( /obj/effect/floor_decal/spline/plain/yellow{ dir = 6 @@ -9360,8 +9383,8 @@ "Rn" = ( /obj/structure/lattice, /obj/item/hullbeacon/green, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/template_noop, +/area/space) "Rp" = ( /obj/machinery/alarm/tcom, /obj/effect/floor_decal/corner/yellow{ @@ -9711,10 +9734,27 @@ /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/bunks) "TF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, -/turf/simulated/floor/tiled/dark, -/area/ship/sol_frigate/starboard_thrusters) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/obj/item/reagent_containers/food/snacks/icecreamsandwich, +/turf/simulated/floor/tiled/freezer{ + name = "cooled tiles"; + temperature = 253.15 + }, +/area/ship/sol_frigate/freezer) "TJ" = ( /obj/machinery/door/airlock/external, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -9865,8 +9905,8 @@ "UI" = ( /obj/item/hullbeacon/green, /obj/structure/lattice, -/turf/space, -/area/ship/sol_frigate/exterior) +/turf/template_noop, +/area/space) "UJ" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 8; @@ -10506,9 +10546,9 @@ /turf/simulated/floor/tiled/white, /area/ship/sol_frigate/sickbay) "XK" = ( -/obj/structure/ship_weapon_dummy/barrel, -/turf/simulated/floor/reinforced/airless, -/area/ship/sol_frigate/port_battery) +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/ship/sol_frigate/starboard_thrusters) "XN" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -10585,7 +10625,7 @@ /area/ship/sol_frigate/hangar) "Yc" = ( /obj/machinery/atmospherics/unary/engine, -/turf/simulated/floor/airless, +/turf/simulated/floor/plating, /area/shuttle/solfrig_shuttle) "Yd" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -10732,7 +10772,7 @@ /area/ship/sol_frigate/hangar) "YM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/ship/sol_frigate/starboard_thrusters) @@ -11250,53 +11290,53 @@ MO MO MO MO -wJ -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -wJ +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc "} (2,1,1) = {" MO @@ -11507,7 +11547,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -11553,7 +11592,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (3,1,1) = {" MO @@ -11764,7 +11804,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -11810,7 +11849,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (4,1,1) = {" MO @@ -12021,7 +12061,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -12067,7 +12106,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (5,1,1) = {" MO @@ -12278,7 +12318,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -12324,7 +12363,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (6,1,1) = {" MO @@ -12535,7 +12575,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -12581,7 +12620,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (7,1,1) = {" MO @@ -12792,7 +12832,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -12838,7 +12877,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (8,1,1) = {" MO @@ -13049,7 +13089,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -13095,7 +13134,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (9,1,1) = {" MO @@ -13306,7 +13346,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -13352,7 +13391,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (10,1,1) = {" MO @@ -13563,7 +13603,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -13609,7 +13648,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (11,1,1) = {" MO @@ -13820,7 +13860,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -13866,7 +13905,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (12,1,1) = {" MO @@ -14077,7 +14117,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -14123,7 +14162,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (13,1,1) = {" MO @@ -14334,7 +14374,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -14380,7 +14419,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (14,1,1) = {" MO @@ -14591,7 +14631,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -14637,7 +14676,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (15,1,1) = {" MO @@ -14848,7 +14888,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -14894,7 +14933,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (16,1,1) = {" MO @@ -15105,7 +15145,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -15151,7 +15190,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (17,1,1) = {" MO @@ -15362,7 +15402,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -15408,7 +15447,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (18,1,1) = {" MO @@ -15619,7 +15659,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -15665,7 +15704,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (19,1,1) = {" MO @@ -15876,7 +15916,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -15922,7 +15961,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (20,1,1) = {" MO @@ -16133,7 +16173,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -16179,7 +16218,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (21,1,1) = {" MO @@ -16390,7 +16430,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -16436,7 +16475,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (22,1,1) = {" MO @@ -16647,7 +16687,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -16693,7 +16732,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (23,1,1) = {" MO @@ -16904,7 +16944,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -16950,7 +16989,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (24,1,1) = {" MO @@ -17161,7 +17201,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -17207,7 +17246,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (25,1,1) = {" MO @@ -17418,7 +17458,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -17464,7 +17503,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (26,1,1) = {" MO @@ -17675,7 +17715,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -17721,7 +17760,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (27,1,1) = {" MO @@ -17932,7 +17972,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -17978,7 +18017,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (28,1,1) = {" MO @@ -18189,7 +18229,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -18235,7 +18274,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (29,1,1) = {" MO @@ -18446,7 +18486,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -18492,7 +18531,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (30,1,1) = {" MO @@ -18703,7 +18743,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -18749,7 +18788,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (31,1,1) = {" MO @@ -18960,7 +19000,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -19006,7 +19045,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (32,1,1) = {" MO @@ -19217,7 +19257,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -19263,7 +19302,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (33,1,1) = {" MO @@ -19474,7 +19514,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -19520,7 +19559,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (34,1,1) = {" MO @@ -19731,7 +19771,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -19777,7 +19816,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (35,1,1) = {" MO @@ -19988,7 +20028,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -20034,7 +20073,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (36,1,1) = {" MO @@ -20245,7 +20285,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -20291,7 +20330,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (37,1,1) = {" MO @@ -20502,7 +20542,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -20548,7 +20587,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (38,1,1) = {" MO @@ -20759,7 +20799,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -20805,7 +20844,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (39,1,1) = {" MO @@ -21016,7 +21056,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -21062,7 +21101,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (40,1,1) = {" MO @@ -21273,7 +21313,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -21319,7 +21358,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (41,1,1) = {" MO @@ -21530,7 +21570,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -21576,7 +21615,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (42,1,1) = {" MO @@ -21787,7 +21827,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -21833,7 +21872,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (43,1,1) = {" MO @@ -22044,7 +22084,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -22090,7 +22129,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (44,1,1) = {" MO @@ -22301,7 +22341,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -22347,7 +22386,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (45,1,1) = {" MO @@ -22558,7 +22598,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -22604,7 +22643,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (46,1,1) = {" MO @@ -22815,7 +22855,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -22861,7 +22900,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (47,1,1) = {" MO @@ -23072,7 +23112,6 @@ MO MO MO MO -FX Xc Xc Xc @@ -23118,7 +23157,8 @@ Xc Xc Xc Xc -FX +Xc +Xc "} (48,1,1) = {" MO @@ -23329,53 +23369,53 @@ MO MO MO MO -wJ -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX -FX +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc +Xc "} (49,1,1) = {" MO @@ -40724,7 +40764,7 @@ AC qn Vz Sd -Sd +TF Xr pF Zs @@ -42216,8 +42256,8 @@ eT tp sQ QB -TF -TF +UW +UW zM bI bI @@ -42475,7 +42515,7 @@ YM ZR ZR UW -UW +Db bI bI Vt @@ -42728,10 +42768,10 @@ MO DD vR zA -ZR -ZR -ZR -ZR +fN +XK +XK +XK Bs GA bI @@ -43055,15 +43095,15 @@ Iq Sa rl rl -rn -rn -rn -rn -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO +MO +MO +MO +MO rl rl MO @@ -43310,17 +43350,17 @@ pK pK pK pK -rn -rn -rn +MO +MO +MO Le px JF -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO rl rl MO @@ -43567,17 +43607,17 @@ pK At JF JF -rn -rn +MO +MO JF JF dS SI -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO rl rl MO @@ -43821,7 +43861,7 @@ yB Hw VK pK -rl +rn Yc ho SI @@ -43831,10 +43871,10 @@ JF jZ JF in -rn -rn -rn -rn +MO +MO +MO +MO rl rl MO @@ -44091,10 +44131,10 @@ JF SI UU UU -rn +MO rl wM -wM +xs wM uG MO @@ -44350,10 +44390,10 @@ qg aI aI ix -wM -wM -wM -wM +xs +xs +xs +xs MO MO MO @@ -44591,7 +44631,7 @@ pK XZ Hw pK -fb +zx oN Lf pX @@ -44606,11 +44646,11 @@ pT cw ha Cc -wM -wM +xs xs wM -wM +xs +xs MO MO MO @@ -44863,11 +44903,11 @@ cm Wq aI aI -wM -wM -wM -wM -wM +xs +xs +xs +xs +xs MO MO MO @@ -45119,12 +45159,12 @@ JF SI UU UU -rn +MO rl wM +xs wM -wM -wM +xs MO MO MO @@ -45363,7 +45403,7 @@ fq Hw gJ pK -rl +rn Yc SK SI @@ -45373,10 +45413,10 @@ JF SI dS QQ -rn -rn -rn -rn +MO +MO +MO +MO rl rl MO @@ -45620,20 +45660,20 @@ uk Hw hm pK -rl +rn JF JF -rn -rn +MO +MO JF JF JF jZ -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO rl rl MO @@ -45880,17 +45920,17 @@ pK pK pK pK -rn -rn -rn +MO +MO +MO gD bT EG -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO rl rl MO @@ -46138,16 +46178,16 @@ Lw hk ht rl -rn -rn -rn -rn -rn -rn -rn -rn -rn -rn +MO +MO +MO +MO +MO +MO +MO +MO +MO +MO rl rl MO @@ -46643,7 +46683,7 @@ we jl EP ZN -Xf +UO Xf UO Xf @@ -47166,16 +47206,16 @@ lt Gt lt et -Vl -Vl -Vl -pg -pg -pg -pg -pg -pg -XK +Xf +Xf +Xf +Xf +Xf +Xf +Xf +Xf +MO +MO MO MO MO @@ -47423,8 +47463,6 @@ uw BL lt rx -QP -Vl Vl pg pg @@ -47433,6 +47471,8 @@ pg pg pg pg +pg +di MO MO MO @@ -47681,15 +47721,15 @@ bn lt iA Ho -Ho -Ho rJ -MO -MO -MO -MO -MO -MO +rJ +rJ +pg +pg +pg +pg +pg +pg MO MO MO @@ -47938,7 +47978,7 @@ Xf jC lt LZ -fN +Xf qp wd MO @@ -48194,8 +48234,8 @@ Xf Xf CX bn -bn -di +eO +lt Xf Xf MO @@ -60126,7 +60166,7 @@ MO MO MO MO -Xc +MO "} (192,1,1) = {" MO @@ -60383,7 +60423,7 @@ MO MO MO MO -Xc +MO "} (193,1,1) = {" MO @@ -60640,7 +60680,7 @@ MO MO MO MO -Xc +MO "} (194,1,1) = {" MO @@ -60897,7 +60937,7 @@ MO MO MO MO -Xc +MO "} (195,1,1) = {" MO @@ -61154,7 +61194,7 @@ MO MO MO MO -Xc +MO "} (196,1,1) = {" MO @@ -61411,7 +61451,7 @@ MO MO MO MO -Xc +MO "} (197,1,1) = {" MO @@ -61668,7 +61708,7 @@ MO MO MO MO -Xc +MO "} (198,1,1) = {" MO @@ -61925,7 +61965,7 @@ MO MO MO MO -Xc +MO "} (199,1,1) = {" MO @@ -62182,7 +62222,7 @@ MO MO MO MO -Xc +MO "} (200,1,1) = {" MO @@ -62439,7 +62479,7 @@ MO MO MO MO -Xc +MO "} (201,1,1) = {" MO @@ -62696,7 +62736,7 @@ MO MO MO MO -Xc +MO "} (202,1,1) = {" MO @@ -62953,7 +62993,7 @@ MO MO MO MO -Xc +MO "} (203,1,1) = {" MO @@ -63210,7 +63250,7 @@ MO MO MO MO -Xc +MO "} (204,1,1) = {" MO @@ -63467,7 +63507,7 @@ MO MO MO MO -Xc +MO "} (205,1,1) = {" MO @@ -63724,7 +63764,7 @@ MO MO MO MO -Xc +MO "} (206,1,1) = {" MO @@ -63981,7 +64021,7 @@ MO MO MO MO -Xc +MO "} (207,1,1) = {" MO @@ -64238,7 +64278,7 @@ MO MO MO MO -Xc +MO "} (208,1,1) = {" MO @@ -64495,7 +64535,7 @@ MO MO MO MO -Xc +MO "} (209,1,1) = {" MO @@ -64752,7 +64792,7 @@ MO MO MO MO -Xc +MO "} (210,1,1) = {" MO @@ -65009,7 +65049,7 @@ MO MO MO MO -Xc +MO "} (211,1,1) = {" MO @@ -65266,7 +65306,7 @@ MO MO MO MO -Xc +MO "} (212,1,1) = {" MO @@ -65523,7 +65563,7 @@ MO MO MO MO -Xc +MO "} (213,1,1) = {" MO @@ -65780,7 +65820,7 @@ MO MO MO MO -Xc +MO "} (214,1,1) = {" MO diff --git a/maps/away/ships/sol/sol_frigate/sol_frigateship.dm b/maps/away/ships/sol/sol_frigate/sol_frigateship.dm index d2235833787..0757bcf26da 100644 --- a/maps/away/ships/sol/sol_frigate/sol_frigateship.dm +++ b/maps/away/ships/sol/sol_frigate/sol_frigateship.dm @@ -6,7 +6,7 @@ prefix = "ships/sol/sol_frigate/" suffix = "sol_frigate.dmm" - sectors = list(SECTOR_BADLANDS, SECTOR_CRESCENT_EXPANSE_WEST, SECTOR_VALLEY_HALE) + sectors = list(SECTOR_CRESCENT_EXPANSE_WEST, SECTOR_BADLANDS, SECTOR_VALLEY_HALE) spawn_weight = 0.75 ship_cost = 1 id = "Sol_frigate" @@ -41,9 +41,9 @@ vessel_size = SHIP_SIZE_LARGE initial_restricted_waypoints = list("Solarian Frigate Shuttle" = list("nav_hangar_solfrig") ) initial_generic_waypoints = list( - "Sol_Frigate_nav1", + "sol_Frigate_nav1", "Sol_Frigate_nav2", - "Sol_Frigate_nav3", + "sol_frigate_nav3", "Sol_Frigate_nav4", "Sol_Frigate_port_dock", "Sol_Frigate_starboard_dock") diff --git a/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm b/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm index 131d910063d..d7467417509 100644 --- a/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm +++ b/maps/away/ships/sol/sol_frigate/sol_frigateship_ghostroles.dm @@ -8,7 +8,7 @@ " mob_name_prefix = "PO3. " - spawnpoints = list("Solfrig_navy_crewman") + spawnpoints = list("solfrig_navy_crewman") max_count = 3 outfit = /obj/outfit/admin/ssrm_navy_crewman @@ -27,7 +27,7 @@ " mob_name_prefix = "CDR. " - spawnpoints = list("Solfrig_commander") + spawnpoints = list("solfrig_commander") max_count = 1 outfit = /obj/outfit/admin/ssrm_navy_officer @@ -45,7 +45,7 @@ accents for the North.) " mob_name_prefix = "LT. " - spawnpoints = list("Solfrig_XO") + spawnpoints = list("solfrig_XO") max_count = 1 outfit = /obj/outfit/admin/ssrm_navy_chief_petty_officer/solfrig_xo @@ -74,7 +74,7 @@ programmed to rigidly serve the interests of the Solarian government above all else. \ " - spawnpoints = list("Solfrig_ipc") + spawnpoints = list("solfrig_ipc") max_count = 1 outfit = /obj/outfit/admin/ssrm_ipc diff --git a/maps/away/ships/xanu/xanu_frigate.dm b/maps/away/ships/xanu/xanu_frigate.dm index 8d1bddb9937..5378f7bc72a 100644 --- a/maps/away/ships/xanu/xanu_frigate.dm +++ b/maps/away/ships/xanu/xanu_frigate.dm @@ -7,10 +7,10 @@ prefix = "ships/xanu/" suffix = "xanu_frigate.dmm" - sectors = list(ALL_COALITION_SECTORS) + sectors = list(ALL_POSSIBLE_SECTORS) spawn_weight_sector_dependent = list(SECTOR_LIBERTYS_CRADLE = 3, SECTOR_XANU = 3, SECTOR_BURZSIA = 0.5) - spawn_weight = 1 - ship_cost = 1 + spawn_weight = 10 + ship_cost = 0.5 id = "xanu_frigate" unit_test_groups = list(3)