mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Sol frigate fixes + Spawnweight adjustments (#21704)
Fixes several bugs and errors on the Sol Frigate after playing on it for a round. This PR also increases the odds of the Frigate spawning in the Valley Hale and Badlands from .75 to 1. Since the Frigate already has to compete with 17 other offships for a chance to spawn in these two sectors. The spawn weight remains the same in the Western Crescent Expanse.
This commit is contained in:
mynameasjeff
@@ -14,7 +14,7 @@
|
||||
/obj/item/ship_ammunition/coilgun
|
||||
name = "tungsten rod pack"
|
||||
name_override = "tungsten rod"
|
||||
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."
|
||||
desc = "A pack of rods used as ammunition for the M55A2 intermediate coilgun, if the obvious labelling and handling instructions didn't already give it away."
|
||||
icon = 'icons/obj/ammo.dmi'
|
||||
icon_state = "trodpack-2"
|
||||
caliber = SHIP_CALIBER_COILGUN
|
||||
|
||||
@@ -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:
|
||||
- bugfix: "Fixes several errors on the Sol Frigate."
|
||||
- spellcheck: "Fixes several spelling errors on things related to the Sol Frigate"
|
||||
- balance: "Changes the Sol Frigate's spawn weight in the Valley Hale and Badlands to 1 instead of .75, on account of how many ships it has to compete with to spawn."
|
||||
@@ -86,11 +86,11 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"aw" = (
|
||||
/obj/structure/bed/stool/chair/sofa/corner/concave,
|
||||
/obj/item/clothing/ears/earphones/earbuds,
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/bed/stool/chair/sofa/corner/concave,
|
||||
/obj/item/clothing/ears/earphones/earbuds,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"ay" = (
|
||||
@@ -1297,6 +1297,10 @@
|
||||
/obj/item/reagent_containers/food/condiment/sugar,
|
||||
/obj/item/reagent_containers/food/condiment/flour,
|
||||
/obj/item/reagent_containers/food/condiment/flour,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -2141,7 +2145,9 @@
|
||||
/obj/effect/floor_decal/corner/dark_blue{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/power/apc/north,
|
||||
/obj/machinery/power/apc/north{
|
||||
req_access = list(203)
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hangar)
|
||||
"jt" = (
|
||||
@@ -3274,6 +3280,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"os" = (
|
||||
@@ -3520,7 +3529,9 @@
|
||||
/area/ship/sol_frigate/bunks)
|
||||
"pF" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/power/apc/south,
|
||||
/obj/machinery/power/apc/south{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
@@ -4605,6 +4616,10 @@
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -4732,8 +4747,12 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"vn" = (
|
||||
/obj/structure/sign/flag/sol/large/south,
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/obj/structure/bed/stool/chair,
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/structure/sign/flag/sol/large/south{
|
||||
pixel_y = 31
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"vv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
@@ -4826,7 +4845,9 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/cic)
|
||||
"vJ" = (
|
||||
/obj/machinery/power/apc/south,
|
||||
/obj/machinery/power/apc/south{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/effect/floor_decal/corner/orange{
|
||||
dir = 10
|
||||
},
|
||||
@@ -4879,7 +4900,9 @@
|
||||
/area/ship/sol_frigate/engineering)
|
||||
"vW" = (
|
||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||
/obj/machinery/power/apc/east,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
@@ -4916,8 +4939,16 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"wd" = (
|
||||
/turf/template_noop,
|
||||
/area/ship/sol_frigate/port_battery)
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"we" = (
|
||||
/turf/simulated/wall/shuttle/raider,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
@@ -5028,7 +5059,9 @@
|
||||
/area/space)
|
||||
"wO" = (
|
||||
/obj/effect/floor_decal/corner/green/diagonal,
|
||||
/obj/machinery/power/apc/south,
|
||||
/obj/machinery/power/apc/south{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/crew_lounge)
|
||||
@@ -6211,7 +6244,9 @@
|
||||
/turf/simulated/floor/wood,
|
||||
/area/ship/sol_frigate/captain_office)
|
||||
"CF" = (
|
||||
/obj/machinery/power/apc/east,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
@@ -6788,7 +6823,9 @@
|
||||
/area/ship/sol_frigate/crew_lounge)
|
||||
"FJ" = (
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/machinery/power/apc/east,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
@@ -7965,6 +8002,10 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/obj/random_produce/box,
|
||||
/turf/simulated/floor/tiled/freezer{
|
||||
name = "cooled tiles";
|
||||
temperature = 253.15
|
||||
@@ -8442,6 +8483,10 @@
|
||||
/obj/machinery/door/firedoor/noid{
|
||||
dir = 4
|
||||
},
|
||||
/obj/item/reagent_containers/food/condiment/shaker/salt,
|
||||
/obj/item/reagent_containers/food/condiment/shaker/peppermill{
|
||||
pixel_x = 7
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"MC" = (
|
||||
@@ -8489,6 +8534,7 @@
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/portable_atmospherics/canister/empty/oxygen,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/eva_storage)
|
||||
"MO" = (
|
||||
@@ -8683,7 +8729,9 @@
|
||||
/area/ship/sol_frigate/hangar)
|
||||
"NO" = (
|
||||
/obj/effect/floor_decal/corner/dark_blue/diagonal,
|
||||
/obj/machinery/power/apc/east,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
@@ -8779,7 +8827,9 @@
|
||||
/area/ship/sol_frigate/starboard_gunnery)
|
||||
"Oi" = (
|
||||
/obj/structure/bed/stool/chair,
|
||||
/obj/machinery/power/apc/east,
|
||||
/obj/machinery/power/apc/east{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
@@ -9180,9 +9230,6 @@
|
||||
/area/ship/sol_frigate/canteen)
|
||||
"Qm" = (
|
||||
/obj/structure/bed/stool/chair,
|
||||
/obj/structure/bed/stool/chair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/corner/paleblue/diagonal,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
@@ -10029,7 +10076,9 @@
|
||||
/obj/structure/closet/walllocker/firecloset{
|
||||
pixel_x = 32
|
||||
},
|
||||
/obj/machinery/power/apc/north,
|
||||
/obj/machinery/power/apc/north{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
@@ -10064,11 +10113,16 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/port_battery)
|
||||
"Vn" = (
|
||||
/obj/machinery/power/apc/west,
|
||||
/obj/machinery/power/apc/west{
|
||||
req_access = list(203)
|
||||
},
|
||||
/obj/effect/floor_decal/corner/yellow{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/cable/blue,
|
||||
/obj/structure/cable/blue{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/ship/sol_frigate/hallway_fore)
|
||||
"Vo" = (
|
||||
@@ -40749,8 +40803,8 @@ MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
mn
|
||||
vn
|
||||
cu
|
||||
ck
|
||||
dG
|
||||
th
|
||||
@@ -41485,10 +41539,10 @@ MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
bI
|
||||
bI
|
||||
bI
|
||||
bI
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
@@ -45911,7 +45965,7 @@ yt
|
||||
yt
|
||||
we
|
||||
dg
|
||||
nr
|
||||
wd
|
||||
xi
|
||||
dL
|
||||
Ta
|
||||
@@ -46168,7 +46222,7 @@ Hy
|
||||
UJ
|
||||
Vn
|
||||
or
|
||||
hl
|
||||
Zz
|
||||
pK
|
||||
HF
|
||||
iJ
|
||||
@@ -46699,7 +46753,7 @@ Xf
|
||||
Xf
|
||||
Xf
|
||||
Xf
|
||||
Xf
|
||||
bI
|
||||
Xf
|
||||
Xf
|
||||
Qd
|
||||
@@ -47979,8 +48033,8 @@ jC
|
||||
lt
|
||||
LZ
|
||||
Xf
|
||||
Xf
|
||||
qp
|
||||
wd
|
||||
MO
|
||||
MO
|
||||
MO
|
||||
|
||||
@@ -6,8 +6,9 @@
|
||||
prefix = "ships/sol/sol_frigate/"
|
||||
suffix = "sol_frigate.dmm"
|
||||
|
||||
sectors = list(SECTOR_CRESCENT_EXPANSE_WEST, SECTOR_BADLANDS, SECTOR_VALLEY_HALE)
|
||||
spawn_weight = 0.75
|
||||
sectors = list(SECTOR_BADLANDS, SECTOR_VALLEY_HALE)
|
||||
spawn_weight_sector_dependent = list(SECTOR_CRESCENT_EXPANSE_WEST = 0.5)
|
||||
spawn_weight = 1
|
||||
ship_cost = 1
|
||||
id = "Sol_frigate"
|
||||
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/solfrig_shuttle)
|
||||
@@ -50,6 +51,6 @@
|
||||
invisible_until_ghostrole_spawn = TRUE
|
||||
|
||||
/obj/effect/overmap/visitable/ship/sol_frigate/New()
|
||||
designation = "[pick("Defender", "Gladiator", "Greyhound", "Vanguard", "Undaunted", "Unchallenged", "Triumphant", "Indefatigable", "Excellent", "Unrelenting", "Furious", "Senate", "Constitution", "Pride and Glory", "Unity", "Superior", "Hunter", "Repulse", "Warspite", "Valiant", "Turner", "Nimitz", "Halsey", "Spruance", "Ingram", "Persistance", "Endurance", "Sprinter")]"
|
||||
designation = "[pick("Defender", "Gladiator", "Greyhound", "Vanguard", "Undaunted", "Unchallenged", "Triumphant", "Indefatigable", "Excellent", "Unrelenting", "Furious", "Senate", "Constitution", "Pride and Glory", "Unity", "Superior", "Hunter", "Repulse", "Warspite", "Valiant", "Turner", "Nimitz", "Halsey", "Spruance", "Ingram", "Persistence", "Endurance", "Sprinter")]"
|
||||
..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user