diff --git a/html/changelogs/MynameAsJess-PR-Whiteboards4everyone.yml b/html/changelogs/MynameAsJess-PR-Whiteboards4everyone.yml
new file mode 100644
index 00000000000..6b14cf91b5c
--- /dev/null
+++ b/html/changelogs/MynameAsJess-PR-Whiteboards4everyone.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: "Added some extra stuff to Military-Oriented Offships, and NVGs to those who aren't issued with thermals."
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index 11ec94a15e4..da8bd329e5f 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -56,11 +56,20 @@
/area/ship/ranger_corvette/engine1)
"aoI" = (
/obj/structure/table/steel,
-/obj/item/flame/lighter/zippo/coalition,
+/obj/item/flame/lighter/zippo/coalition{
+ pixel_x = -10
+ },
/obj/item/material/ashtray/bronze,
/obj/structure/sign/poster{
pixel_x = 32
},
+/obj/item/journal{
+ pixel_x = 4;
+ pixel_y = 10
+ },
+/obj/item/clothing/mask/smokable/cigarette/cigar{
+ pixel_x = -10
+ },
/turf/simulated/floor/carpet/brown,
/area/ship/ranger_corvette/leader)
"aqe" = (
@@ -643,6 +652,7 @@
/obj/structure/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/item/portable_whiteboard,
/turf/simulated/floor/carpet,
/area/ship/ranger_corvette/foyer)
"ckP" = (
@@ -1239,6 +1249,10 @@
pixel_y = 1;
pixel_x = 8
},
+/obj/item/clothing/glasses/night{
+ pixel_y = -2;
+ pixel_x = -5
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"eZx" = (
@@ -6179,6 +6193,14 @@
},
/obj/structure/table/rack/folding_table,
/obj/structure/machinery/recharger,
+/obj/item/clothing/glasses/night{
+ pixel_y = -2;
+ pixel_x = -5
+ },
+/obj/item/clothing/glasses/night{
+ pixel_y = 8;
+ pixel_x = -5
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"wpk" = (
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 c833f11aef5..66eb2b5f977 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship_submaps.dmm
@@ -83,6 +83,9 @@
name = "Armory notice no. 1";
info = "Our old shorties and most of our PDWs and sidearms are busted. I don't know how we did we even manage to get our hands on half of the shit that's stored in these lockers, and I'm too afraid to ask."
},
+/obj/item/ammo_magazine/assault_shotgun,
+/obj/item/ammo_magazine/assault_shotgun/shells,
+/obj/item/ammo_magazine/assault_shotgun/shells,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"j" = (
@@ -102,6 +105,7 @@
/obj/structure/weapons_rack{
req_access = list(13,221,222)
},
+/obj/item/gun/projectile/automatic/rifle/shotgun/xanan,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"m" = (
@@ -211,10 +215,6 @@
/obj/item/ammo_magazine/a65,
/obj/item/ammo_magazine/a65,
/obj/item/ammo_magazine/a65,
-/obj/item/ammo_magazine/d762,
-/obj/item/ammo_magazine/d762,
-/obj/item/ammo_magazine/d762,
-/obj/item/ammo_magazine/d762,
/obj/item/ammo_magazine/submachinemag,
/obj/item/ammo_magazine/submachinemag,
/obj/item/ammo_magazine/a10mm,
@@ -230,6 +230,14 @@
name = "Armory notice no. 1";
info = "Our old shorties and most of our PDWs and sidearms are busted. I don't even know how we got half of the stuff we got as a replacement, and I'm too afraid to ask."
},
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68,
+/obj/item/ammo_magazine/a68/hotaki,
+/obj/item/ammo_magazine/a68/hotaki,
/turf/simulated/floor/tiled/dark,
/area/ship/ranger_corvette/gunnery)
"B" = (
diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
index 7ecba736d85..33d21331d43 100644
--- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
+++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
@@ -1837,6 +1837,12 @@
"pg" = (
/turf/simulated/wall/shuttle/dark/cardinal/gadpathur,
/area/ship/gadpathur_patrol/atmos)
+"ph" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner_wide/white/diagonal,
+/obj/item/lore_radio,
+/turf/simulated/floor/tiled,
+/area/ship/gadpathur_patrol/galley)
"pi" = (
/obj/structure/machinery/iv_drip,
/turf/simulated/floor/tiled/white,
@@ -2801,6 +2807,12 @@
},
/turf/simulated/floor,
/area/ship/gadpathur_patrol/thrusters/port)
+"wB" = (
+/obj/structure/table/reinforced/glass,
+/obj/effect/floor_decal/corner_wide/brown/diagonal,
+/obj/item/portable_whiteboard,
+/turf/simulated/floor/tiled/dark,
+/area/ship/gadpathur_patrol/sit_room)
"wD" = (
/obj/structure/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -4481,6 +4493,11 @@
"IU" = (
/obj/structure/table/steel,
/obj/structure/machinery/door/window/southright,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark,
/area/ship/gadpathur_patrol/crew_prep)
"IV" = (
@@ -37894,7 +37911,7 @@ lO
hg
om
VX
-vW
+wB
fl
GK
cS
@@ -41747,7 +41764,7 @@ uV
qU
IO
rZ
-nW
+ph
Pq
KW
xz
diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
index 47ec0e983cc..660f725441e 100644
--- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
+++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
@@ -1733,6 +1733,13 @@
/area/dominian_corvette/morgue)
"dhp" = (
/obj/structure/table/wood,
+/obj/item/journal,
+/obj/item/flame/lighter/zippo{
+ pixel_x = -4
+ },
+/obj/item/clothing/mask/smokable/cigarette/cigar{
+ pixel_x = 2
+ },
/turf/simulated/floor/carpet/red,
/area/dominian_corvette/co_office)
"dhC" = (
@@ -8692,6 +8699,12 @@
/obj/structure/machinery/light{
dir = 4
},
+/obj/item/flame/lighter/zippo{
+ pixel_x = -4
+ },
+/obj/item/clothing/mask/smokable/cigarette/cigar{
+ pixel_x = 2
+ },
/turf/simulated/floor/wood,
/area/dominian_corvette/fo_office)
"qcn" = (
@@ -8743,6 +8756,10 @@
},
/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/structure/table/steel,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+ pixel_y = 7
+ },
/turf/simulated/floor,
/area/dominian_corvette/eva_prep)
"qhe" = (
@@ -11460,6 +11477,7 @@
dir = 5
},
/obj/structure/machinery/light,
+/obj/structure/whiteboard/portable,
/turf/simulated/floor/wood,
/area/dominian_corvette/co_office)
"vxs" = (
diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
index 30b5b8f48b1..f573c98f657 100644
--- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
+++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
@@ -431,6 +431,9 @@
"cb" = (
/obj/structure/table/steel,
/obj/item/folder/yellow,
+/obj/item/portable_whiteboard{
+ pixel_y = 12
+ },
/turf/simulated/floor/carpet/rubber,
/area/ship/elyran_corvette/briefing)
"cc" = (
@@ -1513,6 +1516,11 @@
pixel_x = 4;
pixel_y = 24
},
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/briefing)
"hv" = (
@@ -5098,8 +5106,9 @@
/obj/structure/machinery/power/apc/south{
req_access = list(207)
},
-/obj/structure/closet/crate/bin,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/stone/marble,
+/obj/structure/machinery/chemical_dispenser/coffeemaster/low_supply,
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"CZ" = (
@@ -7802,6 +7811,7 @@
req_access = list(207);
req_one_access = null
},
+/obj/structure/closet/crate/bin,
/turf/simulated/floor/tiled/white,
/area/ship/elyran_corvette/messhall)
"Ro" = (
@@ -7933,6 +7943,10 @@
/area/ship/elyran_corvette/hangar)
"RU" = (
/obj/effect/decal/cleanable/blood/drip/oil,
+/obj/structure/table/rack,
+/obj/item/ship_ammunition/grauwolf_probe,
+/obj/item/ship_ammunition/grauwolf_probe,
+/obj/item/ship_ammunition/grauwolf_probe,
/turf/simulated/floor/tiled/dark,
/area/ship/elyran_corvette/portwep)
"RV" = (
@@ -9155,6 +9169,13 @@
},
/turf/simulated/floor/tiled/dark/full,
/area/ship/elyran_corvette/starboardthrust)
+"YP" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/lore_radio,
+/turf/simulated/floor/tiled/white,
+/area/ship/elyran_corvette/messhall)
"YZ" = (
/obj/effect/floor_decal/industrial/outline/operations,
/obj/effect/floor_decal/industrial/warning/dust{
@@ -39716,7 +39737,7 @@ nH
WP
Pw
eD
-tW
+YP
Hk
tW
Oi
diff --git a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
index 9a6e22fb966..b1fe121bc60 100644
--- a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
+++ b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
@@ -8812,9 +8812,9 @@
/obj/item/clothing/head/sol/marine/grey,
/obj/item/clothing/head/sol/marine,
/obj/item/clothing/head/ushanka/dominia,
-/obj/item/clothing/head/softcap/tcaf_cap,
-/obj/item/clothing/head/beret/tcaf/field,
-/obj/item/clothing/suit/storage/tcaf,
+/obj/item/clothing/head/softcap/tcfl,
+/obj/item/clothing/head/beret/legion/field,
+/obj/item/clothing/suit/storage/legion,
/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black,
/obj/item/clothing/head/softcap,
/obj/item/clothing/head/turban,
diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
index 3a173d31763..7878325a9c5 100644
--- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
+++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
@@ -688,10 +688,13 @@
/obj/structure/sign/flag/biesel{
pixel_x = -32
},
-/obj/item/clothing/suit/storage/tcaf{
+/obj/item/clothing/suit/storage/legion{
pixel_x = 6;
pixel_y = -2
},
+/obj/item/clothing/head/beret/legion/sentinel{
+ pixel_y = 10
+ },
/obj/item/gun/energy/blaster{
pixel_x = -3;
pixel_y = 1
@@ -3712,12 +3715,12 @@
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white,
-/obj/item/clothing/head/softcap/tcaf_cap,
-/obj/item/clothing/head/softcap/tcaf_cap,
-/obj/item/clothing/head/beret/tcaf,
-/obj/item/clothing/head/beret/tcaf/field,
-/obj/item/clothing/suit/storage/tcaf/legion,
-/obj/item/clothing/suit/storage/tcaf,
+/obj/item/clothing/head/softcap/tcfl,
+/obj/item/clothing/head/softcap/tcfl,
+/obj/item/clothing/head/beret/legion,
+/obj/item/clothing/head/beret/legion/field,
+/obj/item/clothing/suit/storage/legion,
+/obj/item/clothing/suit/storage/legion,
/obj/item/clothing/under/legion,
/obj/item/clothing/under/legion,
/obj/item/clothing/suit/storage/vest/legion,
diff --git a/maps/away/ships/golden_deep/golden_deep_submaps.dmm b/maps/away/ships/golden_deep/golden_deep_submaps.dmm
index d8e854d99b0..d27d5577647 100644
--- a/maps/away/ships/golden_deep/golden_deep_submaps.dmm
+++ b/maps/away/ships/golden_deep/golden_deep_submaps.dmm
@@ -684,19 +684,9 @@
/obj/item/versebook/biesel,
/obj/item/storage/stickersheet/biesel,
/obj/item/clothing/accessory/poncho/shouldercape/nationcapes/biesel,
-/obj/item/clothing/suit/storage/tcaf{
- desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Armed Forces. It looks a little knocked about."
- },
-/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/tcaf,
-/obj/item/clothing/head/beret/tcaf/field,
-/obj/item/clothing/head/beret/tcaf,
/obj/item/clothing/head/softcap/tcaf_cap,
-/obj/structure/closet/crate/secure/tcaf{
- name = "tau ceti armed forces supply crate";
- req_access = null;
- req_one_access = list(229, 217)
- },
/obj/random/dirt_75,
+/obj/structure/whiteboard/portable,
/turf/template_noop,
/area/template_noop)
"Tw" = (
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
index 5d3573b56fe..8fd0d8a4ef3 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
@@ -5656,6 +5656,7 @@
d2 = 8;
icon_state = "0-8"
},
+/obj/structure/whiteboard/portable,
/turf/simulated/floor/wood,
/area/hegemony_ship/canteen)
"GU" = (
diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm
index 0de3e7760fb..80a53d737fb 100644
--- a/maps/away/ships/heph/heph_security/heph_security.dmm
+++ b/maps/away/ships/heph/heph_security/heph_security.dmm
@@ -234,6 +234,7 @@
dir = 10
},
/obj/random/dirt_75,
+/obj/structure/whiteboard,
/turf/simulated/floor/wood,
/area/heph_security_ship/kitchen)
"bC" = (
@@ -791,6 +792,7 @@
dir = 1
},
/obj/random/dirt_75,
+/obj/item/lore_radio,
/turf/simulated/floor/tiled/white,
/area/heph_security_ship/kitchen)
"fo" = (
@@ -3646,6 +3648,11 @@
/obj/item/clothing/suit/armor/carrier/ballistic,
/obj/item/clothing/suit/armor/carrier/ballistic,
/obj/effect/floor_decal/industrial/hatch/red,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark/full,
/area/heph_security_ship/armory)
"yF" = (
@@ -5824,6 +5831,10 @@
dir = 5
},
/obj/structure/machinery/atmospherics/unary/vent_pump/on,
+/obj/item/clothing/mask/smokable/cigarette/cigar,
+/obj/item/flame/lighter/zippo{
+ pixel_x = 10
+ },
/turf/simulated/floor/carpet,
/area/heph_security_ship/captain)
"OO" = (
diff --git a/maps/away/ships/himeo/himeo_patrol_ship.dmm b/maps/away/ships/himeo/himeo_patrol_ship.dmm
index 7362604179b..7efcfb17f41 100644
--- a/maps/away/ships/himeo/himeo_patrol_ship.dmm
+++ b/maps/away/ships/himeo/himeo_patrol_ship.dmm
@@ -1961,7 +1961,7 @@
cycle_to_external_air = 1;
master_tag = "airlock_tcaf_shuttle";
name = "airlock_tcaf_shuttle";
- req_one_access = list(111);
+ req_one_access = list(204);
shuttle_tag = "TCAF Gunship"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
@@ -3715,6 +3715,7 @@
pixel_y = 5;
pixel_x = -1
},
+/obj/item/portable_whiteboard,
/turf/simulated/floor/tiled/steel,
/area/himeo_patrol_ship/messhall)
"pw" = (
@@ -4576,6 +4577,11 @@
/obj/item/clothing/glasses/safety/goggles/tactical,
/obj/item/clothing/glasses/safety/goggles/tactical,
/obj/item/clothing/glasses/safety/goggles/tactical,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night,
+/obj/item/clothing/glasses/night{
+ pixel_y = 7
+ },
/turf/simulated/floor/tiled/dark/full,
/area/himeo_patrol_ship/armoury)
"tN" = (
@@ -8710,6 +8716,7 @@
/obj/structure/machinery/light/colored/decayed/dimmed{
dir = 1
},
+/obj/item/lore_radio,
/turf/simulated/floor/tiled/full,
/area/himeo_patrol_ship/barracks)
"Lc" = (
@@ -10156,7 +10163,7 @@
cycle_to_external_air = 1;
master_tag = "airlock_tcaf_shuttle";
name = "airlock_tcaf_shuttle";
- req_one_access = list(111);
+ req_one_access = list(204);
shuttle_tag = "TCAF Gunship"
},
/obj/effect/map_effect/marker_helper/airlock/exterior,
@@ -11888,6 +11895,10 @@
pixel_x = 4
},
/obj/random/dirt_75,
+/obj/item/clothing/mask/smokable/cigarette/cigar,
+/obj/item/flame/lighter/zippo/himeo{
+ pixel_x = 9
+ },
/turf/simulated/floor/carpet/red,
/area/himeo_patrol_ship/deck_2_office)
"Xx" = (
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index c0146b807d3..c1aef3b8141 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -978,6 +978,7 @@
id = "kasf_captains_shutters";
name = "Window Blast Doors"
},
+/obj/item/journal,
/turf/simulated/floor/wood,
/area/ship/kasf_corvette/captain)
"fM" = (
@@ -1256,6 +1257,8 @@
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
+/obj/item/reagent_containers/food/drinks/bottle/sake,
+/obj/item/reagent_containers/food/drinks/bottle/sake,
/turf/simulated/floor/tiled/dark/full,
/area/ship/kasf_corvette/atmos)
"hn" = (
@@ -5992,6 +5995,10 @@
pixel_y = 7;
pixel_x = 6
},
+/obj/item/portable_whiteboard{
+ pixel_x = -8;
+ pixel_y = 10
+ },
/turf/simulated/floor/carpet/darkblue,
/area/ship/kasf_corvette/mess)
"HX" = (
@@ -8002,6 +8009,10 @@
/obj/item/material/ashtray/bronze{
pixel_y = 16
},
+/obj/item/lore_radio{
+ pixel_y = 12;
+ pixel_x = -5
+ },
/turf/simulated/floor/wood,
/area/ship/kasf_corvette/mess)
"Tm" = (
diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
index c10f9162946..b82f5462152 100644
--- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm
+++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
@@ -7162,6 +7162,7 @@
"Cf" = (
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/table/wood,
+/obj/item/portable_whiteboard,
/turf/simulated/floor/wood{
temperature = 278.15
},
diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
index 0774a1e5546..bef0bbe8df9 100644
--- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
+++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
@@ -2908,7 +2908,7 @@
frequency = 1380;
id_tag = "fsf_hangar";
name = "\improper shuttle docking port controller";
- req_one_access = list(111);
+ req_one_access = list(204);
pixel_y = 28
},
/turf/simulated/floor,
diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
index 24871aed991..b56852d3939 100644
--- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
@@ -4405,7 +4405,7 @@
/obj/item/clothing/shoes/sneakers/black,
/obj/item/clothing/shoes/sneakers/hitops/black,
/obj/item/clothing/under/legion,
-/obj/item/clothing/head/softcap/tcaf_cap,
+/obj/item/clothing/head/softcap/tcfl,
/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight,
/obj/item/clothing/head/beanie/random,
diff --git a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
index 3ee70cb5f68..58ad3d293c8 100644
--- a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
+++ b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
@@ -2132,11 +2132,12 @@
/turf/simulated/floor/tiled/dark,
/area/ship/ssrm_corvette/synthroom)
"eqW" = (
-/obj/structure/filingcabinet/chestdrawer{
- pixel_x = -7
+/obj/structure/bed/stool/chair/padded/brown{
+ dir = 4
},
-/turf/template_noop,
-/area/space)
+/obj/item/portable_whiteboard,
+/turf/simulated/floor/wood/birch,
+/area/ship/ssrm_corvette/crew_lounge)
"esV" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/structure/table/wood,
@@ -2288,7 +2289,7 @@
"eCm" = (
/obj/structure/closet/secure_closet/guncabinet{
name = "Pilot's Amenities";
- req_access = list(111)
+ req_access = list(204)
},
/obj/effect/floor_decal/industrial/outline/grey,
/obj/item/clothing/head/helmet/pilot,
@@ -3695,7 +3696,7 @@
/obj/structure/machinery/vending/wallmed1{
pixel_x = 9;
pixel_y = 32;
- req_access = list(111)
+ req_access = list(204)
},
/turf/simulated/floor/plating,
/area/shuttle/ssrm_shuttle)
@@ -38278,7 +38279,7 @@ jTb
hGn
txv
waK
-hwL
+eqW
mtj
prd
cdz
@@ -49042,7 +49043,7 @@ xRX
xRX
xRX
xRX
-eqW
+xRX
xRX
xRX
xRX
diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm
index 00e1f083bbe..6142d6b13d2 100644
--- a/maps/away/ships/tajara/circus/adhomian_circus.dmm
+++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm
@@ -1564,7 +1564,7 @@
"iiQ" = (
/obj/structure/machinery/computer/ship/helm{
dir = 1;
- req_access = list(111)
+ req_access = list(204)
},
/obj/effect/floor_decal/corner/pink{
dir = 10
diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm
index ff640d45a98..f0229e3bd51 100644
--- a/maps/away/ships/xanu/xanu_frigate.dmm
+++ b/maps/away/ships/xanu/xanu_frigate.dmm
@@ -1187,6 +1187,7 @@
/obj/item/pen{
pixel_y = 3
},
+/obj/item/lore_radio,
/turf/simulated/floor/carpet/red,
/area/ship/xanu_frigate/rec_room)
"er" = (
@@ -1903,6 +1904,13 @@
"gE" = (
/obj/effect/floor_decal/corner/blue/diagonal,
/obj/structure/table/reinforced/steel,
+/obj/item/reagent_containers/food/condiment/syrup_chocolate{
+ pixel_y = 11;
+ pixel_x = -9
+ },
+/obj/item/reagent_containers/food/condiment/sugar{
+ pixel_x = -7
+ },
/turf/simulated/floor/tiled/white,
/area/ship/xanu_frigate/galley)
"gF" = (
@@ -3020,6 +3028,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/item/storage/box/fancy/cigarettes/cigar{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive{
+ pixel_x = 6;
+ pixel_y = 12
+ },
/turf/simulated/floor/carpet/red,
/area/ship/xanu_frigate/captain)
"km" = (
@@ -4021,6 +4037,7 @@
/obj/structure/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
+/obj/structure/machinery/icecream_vat,
/turf/simulated/floor/tiled/white,
/area/ship/xanu_frigate/galley)
"nN" = (
@@ -4370,7 +4387,6 @@
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/structure/closet/secure_closet/freezer,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/turf/simulated/floor/tiled/white,
@@ -7176,6 +7192,14 @@
/obj/item/clothing/accessory/flagpatch/coalition,
/obj/item/clothing/accessory/flagpatch/coalition,
/obj/item/clothing/accessory/flagpatch/coalition,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
+/obj/item/clothing/accessory/flagpatch/all_xanu,
/turf/simulated/floor/tiled/dark/full,
/area/ship/xanu_frigate/cic)
"ze" = (
@@ -8759,6 +8783,36 @@
},
/turf/simulated/floor/tiled/gunmetal,
/area/ship/xanu_frigate/corridor/aft)
+"Ey" = (
+/obj/effect/floor_decal/corner_wide/blue{
+ dir = 10
+ },
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/croissant,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/item/reagent_containers/food/snacks/baguette,
+/obj/structure/closet/secure_closet/freezer{
+ name = "Bakery Storage";
+ desc = "A white refrigerated box containing the daily products of the ship's oven. The availability of croissants and baguettes (even in austere environments) is seen as essential to crew morale by the AXSF."
+ },
+/turf/simulated/floor/tiled/gunmetal,
+/area/ship/xanu_frigate/mess_hall)
"EA" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/warning,
@@ -9148,6 +9202,22 @@
dir = 4;
pixel_x = 20
},
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/cans/beer/whistlingforest,
+/obj/item/reagent_containers/food/drinks/bottle/vintage_wine,
/turf/simulated/floor/wood,
/area/ship/xanu_frigate/captain)
"FV" = (
@@ -9396,7 +9466,6 @@
},
/obj/item/reagent_containers/food/condiment/honey,
/obj/item/reagent_containers/food/condiment/honey,
-/obj/structure/closet/secure_closet/freezer,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
@@ -10991,6 +11060,7 @@
/area/ship/xanu_frigate/corridor/aft_starboard)
"LE" = (
/obj/structure/bed/stool/chair/sofa/right/beige,
+/obj/item/portable_whiteboard,
/turf/simulated/floor/carpet/red,
/area/ship/xanu_frigate/rec_room)
"LF" = (
@@ -12423,6 +12493,10 @@
/obj/item/reagent_containers/food/snacks/donerkebab,
/obj/item/reagent_containers/food/snacks/crepe/chocolate,
/obj/item/reagent_containers/food/snacks/blt,
+/obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray,
+/obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray,
+/obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray,
+/obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray,
/turf/simulated/floor/tiled/gunmetal,
/area/ship/xanu_frigate/mess_hall)
"QK" = (
@@ -49331,7 +49405,7 @@ fy
gv
vN
vp
-XD
+Ey
cx
jv
If