diff --git a/html/changelogs/Mynameasjeff-PR-Gunboatfixes.yml b/html/changelogs/Mynameasjeff-PR-Gunboatfixes.yml
new file mode 100644
index 00000000000..e466a8b8c25
--- /dev/null
+++ b/html/changelogs/Mynameasjeff-PR-Gunboatfixes.yml
@@ -0,0 +1,58 @@
+################################
+# 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:
+ - rscadd: "Fixes several errors on the Ranger Gunboat. Everything actually works as intended, now!"
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index 64f6e8d5de4..d3f939b3b95 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -148,7 +148,9 @@
/turf/simulated/floor/plating,
/area/ship/ranger_corvette/engine1)
"aFp" = (
-/obj/machinery/computer/ship/sensors,
+/obj/machinery/computer/ship/sensors{
+ req_access = list(222)
+ },
/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
"aHv" = (
@@ -343,7 +345,8 @@
},
/obj/machinery/door/airlock/service{
name = "Custodial Closet";
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
dir = 4;
@@ -404,7 +407,8 @@
/obj/machinery/door/airlock{
name = "EVA Storage";
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -599,7 +603,8 @@
/obj/machinery/door/airlock/engineering{
dir = 4;
req_one_access = list(221,222);
- name = "Rotary Cannon Chamber/Starboard Propulsion"
+ name = "Rotary Cannon Chamber/Starboard Propulsion";
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -994,7 +999,8 @@
/obj/machinery/door/airlock/hatch{
name = "Starboard Propulsion";
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -1251,7 +1257,8 @@
"fbf" = (
/obj/machinery/door/airlock/hatch{
name = "Port Propulsion";
- dir = 1
+ dir = 1;
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -1326,9 +1333,6 @@
/obj/item/clothing/accessory/holster,
/obj/item/clothing/accessory/holster,
/obj/item/clothing/accessory/holster,
-/obj/item/clothing/accessory/holster/thigh/fluff,
-/obj/item/clothing/accessory/holster/thigh/fluff,
-/obj/item/clothing/accessory/holster/thigh/fluff,
/obj/item/clothing/head/helmet{
name = "Cheap-looking helmet";
desc = "A cheap helmet, most likely purchased off the aftermarket for some raggedy band of Frontier law enforcement. It might, **might** be able to stop a 9mm and some shrapnel."
@@ -1784,7 +1788,8 @@
"gMK" = (
/obj/machinery/door/airlock/hatch{
name = "Cryogenics";
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -1817,13 +1822,6 @@
/obj/structure/lattice/catwalk/indoor/grate/dark,
/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
-"gSr" = (
-/obj/structure/ship_weapon_dummy{
- is_barrel = 1
- },
-/obj/structure/lattice/catwalk,
-/turf/template_noop,
-/area/ship/ranger_corvette/engine1)
"gUj" = (
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -1834,7 +1832,8 @@
},
/obj/machinery/door/airlock/service{
name = "Dormitory";
- dir = 1
+ dir = 1;
+ req_access = list(222)
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/crew)
@@ -1899,7 +1898,8 @@
"hdZ" = (
/obj/machinery/door/airlock/engineering{
req_one_access = list(221,222);
- name = "Engineering"
+ name = "Engineering";
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -1962,7 +1962,8 @@
},
/obj/machinery/door/airlock/atmos{
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2042,6 +2043,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
+"hUh" = (
+/obj/structure/ship_weapon_dummy,
+/turf/template_noop,
+/area/ship/ranger_corvette/engine1)
"hUx" = (
/obj/effect/landmark/entry_point/port{
name = "port, quarters"
@@ -2061,7 +2066,8 @@
"hZi" = (
/obj/machinery/door/airlock/service{
name = "Dormitory";
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2132,7 +2138,8 @@
/obj/machinery/door/airlock/security{
dir = 4;
req_one_access = list(221,222);
- name = "Brig"
+ name = "Brig";
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2303,7 +2310,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/structure/closet/secure_closet/guncabinet,
+/obj/structure/closet/secure_closet/guncabinet{
+ req_access = list(222)
+ },
/obj/item/gun/projectile/revolver/lemat,
/obj/item/gun/projectile/revolver/lemat,
/obj/item/gun/projectile/revolver/lemat,
@@ -2345,7 +2354,8 @@
/obj/machinery/door/airlock/glass_command{
name = "Bridge";
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -2440,7 +2450,8 @@
icon_state = "tube_empty"
},
/obj/machinery/computer/ship/sensors{
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled/dark,
@@ -2471,7 +2482,8 @@
/obj/machinery/door/airlock/highsecurity{
name = "Ship Munitions Storage";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -2598,13 +2610,6 @@
},
/turf/simulated/wall/shuttle/space_ship/mercenary,
/area/shuttle/ranger_shuttle)
-"jYf" = (
-/obj/structure/ship_weapon_dummy{
- is_barrel = 1
- },
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/airless,
-/area/ship/ranger_corvette/engine1)
"kaR" = (
/obj/structure/sign/directions/com{
dir = 4;
@@ -2732,7 +2737,8 @@
/obj/machinery/door/airlock/highsecurity{
name = "Ship Munitions Storage";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -2867,7 +2873,8 @@
/area/ship/ranger_corvette/munitions)
"lvN" = (
/obj/machinery/computer/shuttle_control/explore/ranger_shuttle{
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
@@ -3049,7 +3056,8 @@
/obj/machinery/door/airlock/silver{
name = "Kitchen";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3144,7 +3152,8 @@
/obj/machinery/door/airlock/highsecurity{
name = "Flak Battery Chamber";
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3388,7 +3397,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/medical{
name = "Surgical Suite";
- dir = 1
+ dir = 1;
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -3645,7 +3655,8 @@
pixel_x = -28;
pixel_y = 12;
dir = 1;
- frequency = 2137
+ frequency = 2137;
+ req_access = list(222)
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft,
@@ -3882,11 +3893,6 @@
"plP" = (
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/brig)
-"pmD" = (
-/obj/structure/ship_weapon_dummy/barrel,
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/airless,
-/area/ship/ranger_corvette/engine1)
"ppM" = (
/obj/structure/sign/directions/medical{
dir = 4;
@@ -3997,7 +4003,8 @@
/obj/machinery/door/airlock/medical{
name = "Medbay";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
dir = 4;
@@ -4071,9 +4078,8 @@
/area/ship/ranger_corvette/telecomms)
"pZW" = (
/obj/structure/lattice/catwalk,
-/obj/structure/ship_weapon_dummy,
/turf/template_noop,
-/area/ship/ranger_corvette/engine1)
+/area/space)
"qbp" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/blast/regular/open{
@@ -4082,6 +4088,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/foyer)
+"qbD" = (
+/obj/structure/ship_weapon_dummy/barrel,
+/turf/template_noop,
+/area/space)
"qcF" = (
/obj/machinery/power/smes/buildable/third_party_shuttle,
/obj/structure/cable/green,
@@ -4160,7 +4170,8 @@
/obj/machinery/door/airlock/highsecurity{
name = "Auxiliary CIC";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -4225,7 +4236,8 @@
/obj/machinery/door/airlock/highsecurity{
name = "Armory";
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
@@ -4309,11 +4321,11 @@
/turf/simulated/floor/tiled/white,
/area/ship/ranger_corvette/canteen)
"qHO" = (
+/obj/structure/lattice/catwalk,
+/obj/item/hullbeacon/red,
/obj/machinery/ship_weapon/autocannon{
weapon_id = "Ranger Francisca Rotary Gun"
},
-/obj/structure/lattice/catwalk,
-/obj/item/hullbeacon/red,
/turf/template_noop,
/area/ship/ranger_corvette/engine1)
"qMt" = (
@@ -4342,7 +4354,8 @@
"qRJ" = (
/obj/machinery/door/airlock/silver{
name = "Washroom";
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4562,7 +4575,8 @@
icon_state = "tube_empty"
},
/obj/machinery/computer/ship/engines{
- dir = 4
+ dir = 4;
+ req_access = list(222)
},
/obj/effect/floor_decal/corner_wide/blue/diagonal,
/turf/simulated/floor/tiled/dark,
@@ -4903,6 +4917,7 @@
identifier = "ranger";
name = "igs - ranger"
},
+/obj/item/synthesized_instrument/guitar,
/turf/simulated/floor/wood,
/area/ship/ranger_corvette/foyer)
"sMm" = (
@@ -5233,7 +5248,8 @@
/area/ship/ranger_corvette/crew)
"twl" = (
/obj/machinery/computer/ship/helm{
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/turf/simulated/floor/tiled/full,
/area/shuttle/ranger_shuttle)
@@ -5243,7 +5259,8 @@
},
/obj/structure/railing/mapped,
/obj/machinery/computer/ship/sensors{
- dir = 1
+ dir = 1;
+ req_access = list(222)
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/bridge)
@@ -5474,7 +5491,8 @@
/obj/structure/railing/mapped,
/obj/machinery/computer/ship/helm{
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/bridge)
@@ -5693,11 +5711,6 @@
},
/turf/simulated/floor/plating,
/area/ship/ranger_corvette/foyer)
-"uFD" = (
-/obj/structure/ship_weapon_dummy,
-/obj/structure/lattice/catwalk,
-/turf/simulated/floor/airless,
-/area/ship/ranger_corvette/engine1)
"uGk" = (
/obj/machinery/door/airlock/external{
dir = 4
@@ -5755,7 +5768,8 @@
name = "fore blast door-control";
pixel_x = -6;
pixel_y = 6;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/button/remote/blast_door{
id = "coc_midship";
@@ -5769,14 +5783,16 @@
name = "aft blast door-control";
pixel_x = 4;
pixel_y = -3;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/button/remote/blast_door{
id = "coc_bridge";
name = "bridge blast door-control";
pixel_x = 4;
pixel_y = 6;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/bridge)
@@ -5886,7 +5902,8 @@
/obj/machinery/door/airlock/command{
dir = 4;
name = "Ranger Leader Quarters";
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -6340,7 +6357,8 @@
"wPn" = (
/obj/machinery/door/airlock/engineering{
req_one_access = list(221,222);
- name = "Engineering"
+ name = "Engineering";
+ req_access = list(222)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6456,7 +6474,8 @@
},
/obj/machinery/door/airlock/engineering{
dir = 4;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/structure/cable/green{
icon_state = "4-8"
@@ -6564,7 +6583,8 @@
/obj/machinery/door/airlock/glass_security{
name = "Holding Cell";
dir = 1;
- req_one_access = list(221,222)
+ req_one_access = list(221,222);
+ req_access = list(222)
},
/obj/machinery/door/firedoor{
req_one_access = list(221,222)
@@ -37082,7 +37102,7 @@ tWh
tWh
tWh
tWh
-xRX
+pZW
xRX
xRX
xRX
@@ -37336,9 +37356,9 @@ xRX
xRX
xRX
tWh
-pZW
-gSr
-gSr
+hUh
+hUh
+hUh
usZ
qHO
xRX
@@ -37593,11 +37613,11 @@ xRX
xRX
xRX
tWh
-uFD
-uFD
-uFD
-uFD
-pmD
+hUh
+hUh
+hUh
+hUh
+qbD
xRX
xRX
xRX
@@ -37850,9 +37870,9 @@ xRX
xRX
xRX
tWh
-jYf
-jYf
-gSr
+hUh
+hUh
+hUh
usZ
aXi
xRX
@@ -38110,7 +38130,7 @@ tWh
boM
tWh
tWh
-xRX
+usZ
xRX
xRX
rrQ
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm b/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm
index d327f0f20c7..c833f11aef5 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm
@@ -111,13 +111,6 @@
/obj/item/gun/projectile/dragunov,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
-"q" = (
-/obj/item/paper{
- name = "Armory notice no. 1";
- info = "Our old shorties and most of our PDWs and sidearms are busted. So we lifted some stuff from some local 'taj smuggler who calls himself Sergei or something. The rifle with the curved mag (I can't pronounce the name for shit) can't take any lathed mags, so hold on to what we have. You'll have to handload the other rifle (again, can't pronounce the name for shit) with 7.62 clips or by hand."
- },
-/turf/template_noop,
-/area/space)
"r" = (
/obj/item/ammo_magazine/a68,
/obj/item/ammo_magazine/a68,
@@ -140,6 +133,10 @@
/obj/item/ammo_magazine/mc9mm,
/obj/item/ammo_magazine/mc9mm,
/obj/item/ammo_magazine/mc9mm,
+/obj/item/paper{
+ name = "Armory notice no. 1";
+ info = "Our old shorties and most of our PDWs and sidearms are busted. So we lifted some stuff from some local 'taj smuggler who calls himself Sergei or something. The rifle with the curved mag (I can't pronounce the name for shit) can't take any lathed mags, so hold on to what we have. You'll have to handload the other rifle (again, can't pronounce the name for shit) with 7.62 clips or by hand."
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"s" = (
@@ -264,7 +261,7 @@
/obj/item/ammo_magazine/a556/carbine,
/obj/item/paper{
name = "Armory notice no. 1";
- info = "Our old shorties and most of our PDWs and sidearms are busted. We had to use a few rifles and shit we captured off the 'imps as a backstop. They aren't too bad, once you get used to the wood furniture and the blood stains."
+ info = "Our old shorties and most of our PDWs and sidearms are busted. So we're using some old Solarian stuff and some kit that was donated from the KAF as a holdover. The mags for our new rifles can't be printed by a 'lathe. So hold on to what you got."
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
@@ -342,7 +339,7 @@
/obj/item/ammo_magazine/c45m/dominia,
/obj/item/paper{
name = "Armory notice no. 1";
- info = "Our old shorties and most of our PDWs and sidearms are bused. So we're using some old Solarian stuff and some kit that was donated from the KAF as a holdover. The mags for our new rifles can't be printed by a 'lathe. So hold on to what you got."
+ info = "Our old shorties and most of our PDWs and sidearms are busted. We had to use a few rifles and shit we captured off the 'imps as a backstop. They aren't too bad, once you get used to the wood furniture and the blood stains."
},
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
@@ -653,7 +650,7 @@ a
a
x
r
-q
+a
a
a
a