mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 07:59:01 +01:00
Sol Fixes, part 3 (#21763)
This PR is intended to be the final round of bug fixes and tweaks to both the SSRM Corvette and the Sol Frigate. To make the Frigate more competitive with It's contemporaries (Xanu Frigate, TCAF Corvette), the armory was buffed with a extra AR and C4. The Exosuit have also been given more equipment to play with. The SSRM Corvette is fixed completely and was completely playtested. Everything works, now!
This commit is contained in:
mynameasjeff
@@ -0,0 +1,63 @@
|
||||
################################
|
||||
# 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:
|
||||
- bugfix: "Fixes several airlock and wiring errors on the SSRM Corvette."
|
||||
- bugfix: "Gives the SSRM Corvette's Chief Petty Officer a proper ID."
|
||||
- rscadd: "Reworks the Sol Frigate's Officer Quarters into a single office and living space."
|
||||
- rscadd: "Gives the Sol Frigate extra kit for it's armory and 'exosuit. This is intended to bring the Frigate up to par with the Xanu Frigate and TCAF Corvette in terms of boarding capability."
|
||||
|
||||
|
||||
@@ -57,6 +57,9 @@
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/mirror{
|
||||
pixel_y = 35
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/captain_cabin)
|
||||
"ar" = (
|
||||
@@ -249,7 +252,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/vending/medical,
|
||||
/obj/machinery/vending/medical{
|
||||
req_access = list(203)
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/sickbay)
|
||||
"bb" = (
|
||||
@@ -311,7 +316,8 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/turf/unsimulated/floor/wood,
|
||||
/obj/structure/lattice/catwalk/indoor/grate/dark,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"bx" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
@@ -427,6 +433,25 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/eva_storage)
|
||||
"ca" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/storage/box/unique/tea{
|
||||
pixel_x = -8
|
||||
},
|
||||
/obj/item/storage/box/unique/tea/jaekseol{
|
||||
pixel_x = -8;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/item/reagent_containers/glass/beaker/teapot{
|
||||
pixel_y = 10
|
||||
},
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup,
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup,
|
||||
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{
|
||||
pixel_y = -4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"cc" = (
|
||||
/obj/effect/floor_decal/corner/lime{
|
||||
dir = 10
|
||||
@@ -572,16 +597,7 @@
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/sickbay)
|
||||
"cN" = (
|
||||
/obj/structure/closet,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/head/sol/dress/officer,
|
||||
/obj/item/clothing/head/sol/dress/officer,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/filingcabinet/filingcabinet,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"cO" = (
|
||||
@@ -656,7 +672,7 @@
|
||||
},
|
||||
/obj/structure/lattice/catwalk/indoor/grate/dark,
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "2-8"
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
@@ -765,6 +781,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"ds" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"dt" = (
|
||||
/obj/machinery/door/airlock/external,
|
||||
/obj/effect/map_effect/marker_helper/airlock/exterior,
|
||||
@@ -857,9 +882,6 @@
|
||||
/turf/unsimulated/floor/wood,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"dL" = (
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
@@ -1233,15 +1255,17 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/captain_office)
|
||||
"fq" = (
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
d1 = 4;
|
||||
d2 = 8;
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hangar)
|
||||
"fs" = (
|
||||
@@ -1301,6 +1325,9 @@
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -1803,6 +1830,7 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/closet/walllocker/emerglocker/west,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"hV" = (
|
||||
@@ -2139,15 +2167,16 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/eva_storage)
|
||||
"jp" = (
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/power/apc/north{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-2";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hangar)
|
||||
"jt" = (
|
||||
@@ -2221,6 +2250,9 @@
|
||||
pixel_x = 12
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/mirror{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"jP" = (
|
||||
@@ -2473,6 +2505,10 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/item/mecha_equipment/mounted_system/combat/grenadesmoke{
|
||||
pixel_y = 13
|
||||
},
|
||||
/obj/item/mecha_equipment/mounted_system/combat/blaster,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/Exo_Bay)
|
||||
"kU" = (
|
||||
@@ -2584,6 +2620,12 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/grenade,
|
||||
/obj/item/grenade,
|
||||
/obj/item/plastique,
|
||||
/obj/item/plastique,
|
||||
/obj/item/plastique,
|
||||
/obj/item/grenade,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/armoury)
|
||||
"lh" = (
|
||||
@@ -3021,7 +3063,7 @@
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
door_color = "#304b77";
|
||||
req_access = list(203);
|
||||
name = "Cargo Bay Storage"
|
||||
name = "Midships hallway"
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid{
|
||||
dir = 8
|
||||
@@ -3281,7 +3323,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
@@ -3422,10 +3464,13 @@
|
||||
id = "solfrig_workshop";
|
||||
name = "Garage door"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/Exo_Bay)
|
||||
"pd" = (
|
||||
/obj/structure/filingcabinet/chestdrawer,
|
||||
/obj/structure/bed/stool/chair/office/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"pe" = (
|
||||
@@ -3610,6 +3655,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/shuttle/solfrig_shuttle)
|
||||
"pU" = (
|
||||
/obj/item/sticker/flagpole/assn{
|
||||
pixel_x = 24
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/space)
|
||||
"pW" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/light{
|
||||
@@ -3657,6 +3708,14 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/armoury)
|
||||
"qc" = (
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"qg" = (
|
||||
/obj/effect/floor_decal/corner/orange{
|
||||
dir = 9
|
||||
@@ -3799,6 +3858,9 @@
|
||||
/obj/structure/sink{
|
||||
pixel_y = 16
|
||||
},
|
||||
/obj/structure/mirror{
|
||||
pixel_y = 35
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/head)
|
||||
"qT" = (
|
||||
@@ -4105,9 +4167,12 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"sJ" = (
|
||||
/obj/structure/mirror,
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/captain_cabin)
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"sN" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 4
|
||||
@@ -4168,10 +4233,12 @@
|
||||
"sZ" = (
|
||||
/obj/structure/sign/kiddieplaque{
|
||||
name = "Solarian Navy commissioning plaque";
|
||||
desc = "A silver-plated plaque dating the date of the commissioning of a Cuirassier-Class frigate in the Solarian Navy. The name of the shipbuilder and naval yards that helped build and bring this ship into commission. A waving Solarian flag and naval ensign is proudly stamped at the bottom."
|
||||
desc = "A silver-plated plaque that cites the date of the commissioning of a Cuirassier (Revised)-frigate into the Solarian Navy. The name of the shipbuilder and naval yards that helped build and bring this ship into commission. A waving Solarian flag and naval ensign is proudly stamped at the bottom.";
|
||||
pixel_y = 32;
|
||||
pixel_x = -3
|
||||
},
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/cic)
|
||||
/area/ship/sol_frigate/port_battery)
|
||||
"tc" = (
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/structure/cable/blue{
|
||||
@@ -4218,11 +4285,11 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/engineering)
|
||||
"tr" = (
|
||||
/obj/machinery/seed_storage,
|
||||
/obj/effect/floor_decal/corner/green/diagonal,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/vending/hydroseeds,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -4484,8 +4551,8 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"uk" = (
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "4-8"
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hangar)
|
||||
@@ -4509,6 +4576,7 @@
|
||||
dir = 8;
|
||||
level = 2
|
||||
},
|
||||
/obj/structure/bed/stool/chair/office/light,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"up" = (
|
||||
@@ -4620,6 +4688,9 @@
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -4939,14 +5010,18 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"wd" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "2-4"
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
dir = 8;
|
||||
name = "Midships hallway";
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"we" = (
|
||||
@@ -4963,6 +5038,7 @@
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/alarm/north,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/Starboard_docking_port)
|
||||
"wn" = (
|
||||
@@ -5025,7 +5101,6 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/armoury)
|
||||
"wE" = (
|
||||
/obj/structure/closet/walllocker/emerglocker/west,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
@@ -5100,7 +5175,7 @@
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
door_color = "#304b77";
|
||||
req_access = list(203);
|
||||
name = "Cargo Bay Storage"
|
||||
name = "Aft quarter hallway"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
@@ -5148,6 +5223,13 @@
|
||||
"xs" = (
|
||||
/turf/simulated/floor/airless,
|
||||
/area/space)
|
||||
"xt" = (
|
||||
/obj/structure/bed/stool/chair/padded/beige,
|
||||
/obj/structure/weapon_rack{
|
||||
pixel_y = 32
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"xy" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden{
|
||||
dir = 8
|
||||
@@ -5684,6 +5766,12 @@
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/sign/kiddieplaque{
|
||||
name = "Solarian Navy commissioning plaque";
|
||||
desc = "A silver-plated plaque that cites the date of the commissioning of a Cuirassier (Revised)-frigate into the Solarian Navy. The name of the shipbuilder and naval yards that helped build and bring this ship into commission. A waving Solarian flag and naval ensign is proudly stamped at the bottom.";
|
||||
pixel_y = 32;
|
||||
pixel_x = -3
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/cic)
|
||||
"Ar" = (
|
||||
@@ -5885,6 +5973,10 @@
|
||||
req_access = list(222)
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/hatch/red,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
id = "SFLD";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/Port_docking_port)
|
||||
"Bg" = (
|
||||
@@ -6250,6 +6342,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/captain_office)
|
||||
"CG" = (
|
||||
@@ -6484,6 +6577,12 @@
|
||||
/obj/item/synthesized_instrument/violin,
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/ship/sol_frigate/captain_cabin)
|
||||
"DP" = (
|
||||
/obj/structure/bed/stool/chair/padded/beige{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"DT" = (
|
||||
/obj/machinery/vending/engineering,
|
||||
/obj/effect/floor_decal/corner/orange{
|
||||
@@ -6781,12 +6880,13 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"Fv" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/modular_computer/laptop,
|
||||
/obj/machinery/light{
|
||||
dir = 4;
|
||||
status = 2
|
||||
},
|
||||
/obj/structure/bed/stool/chair/office/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"Fy" = (
|
||||
@@ -7589,6 +7689,10 @@
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/effect/floor_decal/industrial/hatch/red,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
id = "SFLD";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/Starboard_docking_port)
|
||||
"IZ" = (
|
||||
@@ -8006,6 +8110,9 @@
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/obj/item/storage/box/large/produce,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -8093,7 +8200,7 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/flora/pottedplant/woodyshrubdying,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"Ld" = (
|
||||
@@ -8178,6 +8285,11 @@
|
||||
id = "SFLD"
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
/obj/structure/cable/green{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hangar)
|
||||
"Lp" = (
|
||||
@@ -8457,8 +8569,8 @@
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
/obj/structure/mirror{
|
||||
pixel_x = 32
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
@@ -8476,6 +8588,10 @@
|
||||
/obj/effect/map_effect/marker_helper/airlock/exterior,
|
||||
/obj/effect/map_effect/marker/airlock/docking/sol_frigate/port_dock,
|
||||
/obj/effect/floor_decal/industrial/hatch/red,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
id = "SFLD";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/Port_docking_port)
|
||||
"Mo" = (
|
||||
@@ -8534,7 +8650,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/canister/empty/oxygen,
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/eva_storage)
|
||||
"MO" = (
|
||||
@@ -8579,6 +8695,10 @@
|
||||
/obj/effect/map_effect/marker_helper/airlock/exterior,
|
||||
/obj/effect/map_effect/marker/airlock/docking/sol_frigate/starboard_dock,
|
||||
/obj/effect/floor_decal/industrial/hatch/red,
|
||||
/obj/machinery/door/blast/shutters/open{
|
||||
id = "SFLD";
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/Starboard_docking_port)
|
||||
"MV" = (
|
||||
@@ -8623,6 +8743,7 @@
|
||||
"Nl" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/light,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/bunks)
|
||||
"Nr" = (
|
||||
@@ -8735,6 +8856,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/brig)
|
||||
"NP" = (
|
||||
@@ -8826,13 +8948,18 @@
|
||||
/turf/simulated/floor/plating,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"Oi" = (
|
||||
/obj/structure/bed/stool/chair,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/structure/table/wood/maple,
|
||||
/obj/item/pen/fountain,
|
||||
/obj/item/paper_bin{
|
||||
pixel_y = 2;
|
||||
pixel_x = -7
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"Ok" = (
|
||||
@@ -8971,7 +9098,7 @@
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
door_color = "#304b77";
|
||||
req_access = list(203);
|
||||
name = "Cargo Bay Storage"
|
||||
name = "Aft quarter hallway"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
@@ -9167,6 +9294,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/structure/table/wood/maple,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"PN" = (
|
||||
@@ -9186,9 +9314,15 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/brig)
|
||||
"Qc" = (
|
||||
/obj/structure/mirror,
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/head)
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"Qd" = (
|
||||
/obj/structure/lattice,
|
||||
/turf/template_noop,
|
||||
@@ -9303,7 +9437,7 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/engineering)
|
||||
"QD" = (
|
||||
/obj/structure/sign/flag/sol,
|
||||
/obj/item/melee/ceremonial_sword,
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"QG" = (
|
||||
@@ -9471,6 +9605,13 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/engineering)
|
||||
"RI" = (
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/engineering)
|
||||
"RJ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -9547,6 +9688,9 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/structure/closet/walllocker/emerglocker/north,
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"Sa" = (
|
||||
@@ -9584,7 +9728,7 @@
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
door_color = "#304b77";
|
||||
req_access = list(203);
|
||||
name = "Cargo Bay Storage"
|
||||
name = "Aft quarter hallway"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
@@ -9639,7 +9783,7 @@
|
||||
"SB" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/structure/closet/walllocker/emerglocker/west,
|
||||
/obj/item/modular_computer/laptop,
|
||||
/obj/item/modular_computer/laptop/preset,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/captain_office)
|
||||
"SD" = (
|
||||
@@ -9647,6 +9791,7 @@
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"SF" = (
|
||||
@@ -9697,9 +9842,9 @@
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/Port_docking_port)
|
||||
"SR" = (
|
||||
/obj/structure/mirror,
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/cic)
|
||||
"SV" = (
|
||||
/obj/structure/filingcabinet/chestdrawer,
|
||||
/obj/item/flashlight/lamp{
|
||||
@@ -9957,7 +10102,7 @@
|
||||
"UJ" = (
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
dir = 8;
|
||||
name = "Mess Hall";
|
||||
name = "Fore quarter hallway";
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
@@ -10085,6 +10230,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/structure/closet/crate/bin,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/ocountry)
|
||||
"Vi" = (
|
||||
@@ -10766,11 +10912,16 @@
|
||||
/area/ship/sol_frigate/cic)
|
||||
"YB" = (
|
||||
/obj/structure/closet,
|
||||
/obj/item/clothing/accessory/badge/passcard/sol,
|
||||
/obj/item/clothing/accessory/badge/passcard/sol,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/under/rank/sol/dress/subofficer,
|
||||
/obj/item/clothing/head/sol/dress/officer,
|
||||
/obj/item/clothing/head/sol/dress/officer,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/item/clothing/shoes/jackboots,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/clothing/accessory/badge/passcard/sol,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/oquarters)
|
||||
"YC" = (
|
||||
@@ -10932,6 +11083,10 @@
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/gun/projectile/automatic/rifle/sol,
|
||||
/obj/item/ammo_magazine/c762/sol,
|
||||
/obj/item/ammo_magazine/c762/sol,
|
||||
/obj/item/ammo_magazine/c762/sol,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/armoury)
|
||||
"Zj" = (
|
||||
@@ -11069,7 +11224,7 @@
|
||||
"ZI" = (
|
||||
/obj/machinery/door/airlock/multi_tile/glass{
|
||||
dir = 8;
|
||||
name = "Mess Hall";
|
||||
name = "Midships hallway";
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/machinery/door/firedoor/noid,
|
||||
@@ -43925,7 +44080,7 @@ JF
|
||||
jZ
|
||||
JF
|
||||
in
|
||||
MO
|
||||
pU
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
@@ -44131,7 +44286,7 @@ Tw
|
||||
uX
|
||||
Cm
|
||||
BV
|
||||
sJ
|
||||
EA
|
||||
aq
|
||||
EA
|
||||
cx
|
||||
@@ -44419,7 +44574,7 @@ hy
|
||||
BB
|
||||
vI
|
||||
vI
|
||||
vI
|
||||
SR
|
||||
QX
|
||||
yt
|
||||
uf
|
||||
@@ -44672,7 +44827,7 @@ lb
|
||||
ie
|
||||
ob
|
||||
AA
|
||||
sZ
|
||||
yt
|
||||
Ap
|
||||
YQ
|
||||
TS
|
||||
@@ -45138,7 +45293,7 @@ SM
|
||||
WS
|
||||
SM
|
||||
aC
|
||||
Rl
|
||||
RI
|
||||
iE
|
||||
tF
|
||||
SM
|
||||
@@ -45168,9 +45323,9 @@ Fh
|
||||
MG
|
||||
hU
|
||||
QD
|
||||
hU
|
||||
MG
|
||||
hU
|
||||
xt
|
||||
ca
|
||||
DP
|
||||
MG
|
||||
ZE
|
||||
DI
|
||||
@@ -45658,7 +45813,7 @@ WH
|
||||
mw
|
||||
kF
|
||||
FF
|
||||
jB
|
||||
sJ
|
||||
Kp
|
||||
ek
|
||||
eC
|
||||
@@ -45708,7 +45863,7 @@ yt
|
||||
yt
|
||||
yt
|
||||
RZ
|
||||
PD
|
||||
qc
|
||||
Lo
|
||||
uk
|
||||
Hw
|
||||
@@ -45933,8 +46088,8 @@ dr
|
||||
XX
|
||||
MG
|
||||
MG
|
||||
SR
|
||||
SR
|
||||
MG
|
||||
MG
|
||||
MG
|
||||
MG
|
||||
YB
|
||||
@@ -45965,7 +46120,7 @@ yt
|
||||
yt
|
||||
we
|
||||
dg
|
||||
wd
|
||||
nm
|
||||
xi
|
||||
dL
|
||||
Ta
|
||||
@@ -46206,7 +46361,7 @@ oW
|
||||
nt
|
||||
jH
|
||||
Hd
|
||||
Nv
|
||||
wd
|
||||
bL
|
||||
GD
|
||||
Nv
|
||||
@@ -46215,14 +46370,14 @@ Nv
|
||||
Nv
|
||||
TV
|
||||
Hy
|
||||
Nv
|
||||
Qc
|
||||
Nv
|
||||
ky
|
||||
Hy
|
||||
UJ
|
||||
Vn
|
||||
or
|
||||
Zz
|
||||
hl
|
||||
pK
|
||||
HF
|
||||
iJ
|
||||
@@ -46463,7 +46618,7 @@ uO
|
||||
vv
|
||||
Jp
|
||||
fO
|
||||
lw
|
||||
ds
|
||||
BO
|
||||
Ok
|
||||
lw
|
||||
@@ -46750,7 +46905,7 @@ Xf
|
||||
Xf
|
||||
Xf
|
||||
Xf
|
||||
Xf
|
||||
sZ
|
||||
Xf
|
||||
Xf
|
||||
bI
|
||||
@@ -47490,7 +47645,7 @@ TE
|
||||
xf
|
||||
Ih
|
||||
aW
|
||||
Qc
|
||||
IT
|
||||
qS
|
||||
Nc
|
||||
IT
|
||||
@@ -47747,7 +47902,7 @@ pW
|
||||
iM
|
||||
Wv
|
||||
uR
|
||||
Qc
|
||||
IT
|
||||
qS
|
||||
Nc
|
||||
xG
|
||||
@@ -48004,7 +48159,7 @@ aW
|
||||
In
|
||||
Ih
|
||||
aW
|
||||
Qc
|
||||
IT
|
||||
qS
|
||||
iP
|
||||
IT
|
||||
|
||||
@@ -2061,10 +2061,6 @@
|
||||
/obj/item/reagent_containers/pill/nicotine{
|
||||
pixel_y = -1
|
||||
},
|
||||
/obj/item/reagent_containers/inhaler/space_drugs{
|
||||
pixel_y = 6;
|
||||
pixel_x = -4
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/ssrm_corvette/port_thrusters)
|
||||
"emc" = (
|
||||
@@ -2135,6 +2131,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/ssrm_corvette/synthroom)
|
||||
"eqW" = (
|
||||
/obj/structure/filingcabinet/chestdrawer{
|
||||
pixel_x = -7
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/space)
|
||||
"esV" = (
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/structure/table/wood,
|
||||
@@ -3678,6 +3680,10 @@
|
||||
pixel_x = -7;
|
||||
pixel_y = 20
|
||||
},
|
||||
/obj/item/storage/chewables/tobacco/bad{
|
||||
pixel_y = 20;
|
||||
pixel_x = -5
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/ssrm_corvette/eva_preperation)
|
||||
"hFY" = (
|
||||
@@ -4713,6 +4719,11 @@
|
||||
req_access = list(203);
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2";
|
||||
d1 = 1;
|
||||
d2 = 2
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/ship/ssrm_corvette/port_gunnery)
|
||||
"kaR" = (
|
||||
@@ -5163,6 +5174,10 @@
|
||||
pixel_y = 5;
|
||||
pixel_x = 3
|
||||
},
|
||||
/obj/item/storage/box/fancy/cigarettes/nicotine{
|
||||
pixel_y = 14;
|
||||
pixel_x = -9
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/ssrm_corvette/eva_preperation)
|
||||
"lfX" = (
|
||||
@@ -7374,6 +7389,7 @@
|
||||
pixel_x = 27
|
||||
},
|
||||
/obj/effect/map_effect/marker/airlock/shuttle/ssrm_shuttle,
|
||||
/obj/effect/map_effect/marker_helper/airlock/exterior,
|
||||
/turf/simulated/floor/reinforced/airless,
|
||||
/area/shuttle/ssrm_shuttle)
|
||||
"que" = (
|
||||
@@ -8224,6 +8240,8 @@
|
||||
},
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/modular_computer/laptop/preset/civilian,
|
||||
/obj/item/clothing/head/sol,
|
||||
/obj/item/device/radio/headset/ship,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/ssrm_corvette/cpo_cabin)
|
||||
"sIJ" = (
|
||||
@@ -49023,7 +49041,7 @@ xRX
|
||||
xRX
|
||||
xRX
|
||||
xRX
|
||||
xRX
|
||||
eqW
|
||||
xRX
|
||||
xRX
|
||||
xRX
|
||||
|
||||
@@ -91,9 +91,14 @@
|
||||
name = "Sol Navy Recon Chief Petty Officer"
|
||||
|
||||
uniform = /obj/item/clothing/under/rank/sol/dress/pettyofficer
|
||||
shoes = /obj/item/clothing/shoes/laceup
|
||||
back = /obj/item/storage/backpack/satchel/leather
|
||||
head = /obj/item/clothing/head/sol/dress
|
||||
shoes = /obj/item/clothing/shoes/jackboots
|
||||
back = /obj/item/storage/backpack/satchel
|
||||
head = /obj/item/clothing/head/sol
|
||||
|
||||
id = /obj/item/card/id/ssrm_ship
|
||||
|
||||
/obj/outfit/admin/ssrm_navy_chief_petty_officer/get_id_access()
|
||||
return list(ACCESS_SOL_SHIPS, ACCESS_EXTERNAL_AIRLOCKS)
|
||||
|
||||
/datum/ghostspawner/human/ssrm_marine_pilot
|
||||
short_name = "ssrm_marine_pilot"
|
||||
|
||||
Reference in New Issue
Block a user