Upstream 2026-02-22-0145Z

.archive/.github/CODEOWNERS

@@ -28,7 +28,11 @@
 /code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
 /code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
 /code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
-/code/modules/projectiles/ @FalloutFalcon
+/code/modules/projectiles/gun.dm @FalloutFalcon
+/code/modules/projectiles/projectile.dm @FalloutFalcon
+/code/modules/projectiles/guns/ballistic.dm @FalloutFalcon
+/code/modules/projectiles/guns/energy.dm @FalloutFalcon
+/code/modules/projectiles/guns/powered.dm @FalloutFalcon
 /code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
 /code/modules/unit_tests/icons/ @FalloutFalcon
 /code/modules/missions/ @FalloutFalcon

.archive/.github/CONTRIBUTING.md

@@ -29,29 +29,65 @@ You can of course, as always, ask for help on the discord channels, or the forum
 
 ## Meet the Team
 
-### Development Head
+### Project Lead
 
-The Head Developer is responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not. The Development Head also has the final say on what gameplay changes get into and out of the game. He or she has full veto power on any feature or balance additions, changes, or removals, and attempts to establish a universally accepted direction for the game.
+The Project Lead is responsible for controlling, adding, and removing maintainers from the project. In addition to filling the role of a normal maintainer, they have sole authority on who becomes a maintainer, as well as who remains a maintainer and who does not. The Project Lead also has the final say on what gameplay changes are added to and removed from the game. He or she has full veto power on any feature or balance additions, changes, or removals, and attempts to establish a universally accepted direction for the game.
 
-### Maintainers
+### Head Coder/Codetainers
 
-Maintainers are quality control. If a proposed pull request doesn't meet the following specifications, they can request you to change it, or simply just close the pull request. Maintainers can close a pull request for the following reasons: The pull request doesn't follow the guidelines, excessively undocumented changes, failure to comply with coding standards. Note that maintainers should generally help bring a pull request up to standard instead of outright closing the PR; however if the pull request author does not comply with the given guidelines or refuses to adhere to the required coding standards the pull request will be closed. **Maintainers must have a valid reason to close a pull request and state what the reason is when they close the pull request.**
+The Head Coder controls the quality of code, maintainability of the project, CI, and unit tests. They have a say over features, but primarily based on the merit of the code, e.g., long-term maintenance for complex features.
 
-Maintainers can revert your changes if they feel they are not worth maintaining or if they did not live up to the quality specifications.
+### Lore Head/Loretainers
+
+Much of the lore team's work is done outside github itself, much of it in doucments or wiki pages; however, lore-maints can still be manually requested on a pr if it has a significant lore implication.
 
-### Head Spriter
+### Head Spriter/Spritetainers
 
 The Head Spriter controls sprites and aesthetic that get into the game. While sprites for brand-new additions are generally accepted regardless of quality, modified current art assets fall to the Head Spriter, who can decide whether or not a sprite tweak is both merited and a suitable replacement.
 
 They also control the general "perspective" of the game - how sprites should generally look, especially the angle from which they're viewed. An example of this is the 3/4 perspective, which is a bird's eye view from above the object being viewed.
 
-### Head Mapper
+### Head Mapper/Maptainers
+
+The Head Mapper controls ships, ruins, and other maps, including their balance and cost. Final decision on whether or not a map is added is at their discretion and cannot be vetoed by anyone other than the Project Lead.
+
+### Maintainers
+
+Maintainers are quality control. If a proposed pull request doesn't meet the following specifications, they can request you to change it, or simply just close the pull request. Singular Maintainers can close a pull request for the following reasons: The pull request doesn't follow the guidelines, has excessively undocumented changes, or fails to comply with coding standards. Note that maintainers should generally help bring a pull request up to standard instead of outright closing the PR; however, if the pull request author does not comply with the given guidelines or refuses to adhere to the required coding standards, the pull request will be closed. 
+
+Internal discussions can be held to close given PRs based on merits like general team desires and overall direction.
+
+**Maintainers must have a valid reason to close a pull request and state what the reason is when they close the pull request.**
 
-The Head Mapper controls ships and all variants of shuttles, including their balance and cost. Final decision on whether or not a shuttle is added is at their discretion and cannot be vetoed by anyone other than the Head Coder.
+Maintainers can revert your changes if they feel they are not worth maintaining or if they did not live up to the quality specifications.
+
+Unlike most other servers, we have a more formal seperation between code-tainers, map-tainers, sprite-tainers, and even lore-tainers (lore curators). They operate semi-independently, and prs that makes meaningful changes to parts of the game requires approval from each relevent team.
+Examples of changes that don't require approval
+- A few fluff sprites for a map.
+- Simple subtypes for a pr that adds clothing sprites.
+
+Game balance changes (map balance changes will still require maptainer approval), despite being a code change, can be reviewed by any maintainer or even admin.
 
 ### Maintainer Code of Conduct
 
-Maintainers are expected to maintain the codebase in its entirety. This means that maintainers are in charge of pull requests, issues, and the Git discussion board. Maintainers have say on what will and will not be merged. Maintainers should assign themselves to pull requests that they are claiming and reviewing and should respect when others assign themselves to a pull request and not interfere except in situations where they believe a pull request to be heavily detrimental to the codebase or its playerbase. **Maintainers are not server admins and should not use their rank on the server to perform admin related tasks except where asked to by a Senior Admin or higher.**
+Maintainers are expected to maintain the codebase in its entirety. This means that maintainers are in charge of pull requests, issues, and the Git discussion board. Maintainers have a say on what will and will not be merged. **Maintainers are not server admins and should not use their rank on the server to perform admin related tasks except where asked to by a Headmin or higher.**
+
+<details>
+<summary>Maintainer Guidelines</summary>
+
+These are the few directives we have for project maintainers.
+
+- Do not merge PRs you create.
+- Do not merge PRs until 24 hours have passed since they were opened. Exceptions include:
+  - Emergency fixes or CI fixes.
+    - Try to get secondary maintainer approval before merging if you can.
+  - PRs with empty commits that are intended to generate a changelog.
+- Do not close PRs purely for breaking a template if the same information is contained without it.
+
+These are not steadfast rules, as maintainers are expected to use their best judgment when operating.
+
+</details>
+
 
 ## Specifications
 

_maps/RandomRuins/BeachRuins/beach_gunsmith.dmm

@@ -3677,10 +3677,7 @@
 /turf/open/floor/concrete/tiles,
 /area/ruin/beach/gunsmith)
 "Mb" = (
-/obj/item/gun/energy/plasmacutter{
-	pixel_x = -16;
-	pixel_y = 11
-	},
+/obj/item/plasmacutter,
 /obj/effect/decal/cleanable/oil/slippery,
 /mob/living/simple_animal/hostile/human/ramzi/civilian{
 	wander = 0

_maps/RandomRuins/IceRuins/icemoon_command_post.dmm

@@ -3586,13 +3586,8 @@
 /turf/open/floor/plasteel/patterned/grid/dark,
 /area/ruin/icemoon/command_post/crew_quarters)
 "Hg" = (
-/obj/structure/chair/office/dark{
-	dir = 8
-	},
-/mob/living/simple_animal/hostile/human/ramzi/ranged/space/stormtrooper/hydra/dmr{
-	wander = 0
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/mob/living/simple_animal/hostile/human/ramzi/ranged/space/stormtrooper/hydra/dmr/sentry,
 /turf/open/floor/concrete/slab_4,
 /area/ruin/icemoon/command_post/armory)
 "Ho" = (
@@ -5127,6 +5122,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
 /turf/open/floor/concrete/slab_4,
 /area/ruin/icemoon/command_post/armory)
 "Wt" = (

_maps/RandomRuins/IceRuins/icemoon_training_center.dmm

@@ -2150,6 +2150,7 @@
 	pixel_x = 0;
 	pixel_y = -5
 	},
+/obj/item/reagent_containers/food/drinks/mead,
 /turf/open/floor/wood,
 /area/ruin/icemoon/training_facility/office_2)
 "kA" = (
@@ -4342,7 +4343,7 @@
 /turf/open/floor/plating,
 /area/ruin/icemoon/training_facility/classroom)
 "vC" = (
-/obj/machinery/computer/apc_control{
+/obj/machinery/computer/monitor{
 	dir = 1
 	},
 /obj/effect/spawner/random/trash/crushed_can{
@@ -5369,11 +5370,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
 /area/ruin/icemoon/training_facility/classroom)
-"Ay" = (
-/obj/structure/table/greyscale,
-/obj/item/attachment/gun/flamethrower,
-/turf/open/floor/plating/asteroid/icerock/cracked,
-/area/ruin/icemoon/training_facility)
 "AA" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 5
@@ -6371,6 +6367,10 @@
 "Ff" = (
 /turf/open/floor/plasteel/grimy,
 /area/ruin/icemoon/training_facility/dorms)
+"Fi" = (
+/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones,
+/turf/open/floor/plating/rust,
+/area/ruin/icemoon/training_facility/medbay)
 "Fj" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -7673,7 +7673,6 @@
 /area/ruin/icemoon/training_facility/dorms)
 "Lz" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/human/ramzi/melee/sawbones,
 /turf/open/floor/plasteel/mono/white,
 /area/ruin/icemoon/training_facility/medbay)
 "LA" = (
@@ -8516,6 +8515,11 @@
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/icemoon/training_facility/classroom)
+"PO" = (
+/obj/structure/table/greyscale,
+/obj/item/attachment/gun/flamethrower,
+/turf/open/floor/plating/asteroid/icerock/cracked,
+/area/ruin/icemoon/training_facility)
 "PP" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -9244,7 +9248,6 @@
 	pixel_x = 0;
 	pixel_y = 12
 	},
-/obj/item/reagent_containers/food/drinks/mead,
 /turf/open/floor/wood,
 /area/ruin/icemoon/training_facility/office_2)
 "SW" = (
@@ -13943,7 +13946,7 @@ qr
 tx
 Cd
 wr
-ZU
+Fi
 ZU
 rW
 qP
@@ -14822,7 +14825,7 @@ kk
 wN
 Bv
 kk
-Ay
+PO
 xj
 xj
 tB

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -3813,7 +3813,7 @@
 	req_access = list(150,10);
 	populate = 0
 	},
-/obj/item/gun/energy/plasmacutter,
+/obj/item/plasmacutter,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/storage/belt/utility/syndicate,
 /obj/item/clothing/under/syndicate/gec,

_maps/RandomRuins/JungleRuins/jungle_interceptor.dmm

@@ -3607,7 +3607,7 @@
 /turf/open/floor/plating/rust,
 /area/ruin/jungle/interceptor/forehall)
 "Fs" = (
-/obj/machinery/computer/apc_control{
+/obj/machinery/computer/monitor{
 	dir = 4
 	},
 /turf/open/floor/plating/rust,

_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm

@@ -1829,10 +1829,7 @@
 	pixel_x = 8;
 	pixel_y = 21
 	},
-/obj/item/shield/riot/goliath{
-	pixel_x = -12;
-	pixel_y = 16
-	},
+/obj/item/shield/buckler,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "Vt" = (

_maps/RandomRuins/MoonRuins/moon_moonbase.dmm

@@ -351,7 +351,7 @@
 /area/ruin/moon/moonbase/refinery)
 "cM" = (
 /obj/structure/closet/toolcloset/empty,
-/obj/item/gun/energy/plasmacutter,
+/obj/item/plasmacutter,
 /obj/item/storage/toolbox/electrical,
 /obj/item/storage/toolbox/mechanical,
 /obj/item/clothing/glasses/welding,
@@ -897,9 +897,6 @@
 	pixel_x = -10;
 	pixel_y = 6
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 4
 	},
@@ -945,9 +942,6 @@
 /obj/structure/railing/thin/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 1
 	},
@@ -1398,15 +1392,13 @@
 /area/ruin/moon/moonbase/cargo)
 "kN" = (
 /obj/structure/railing/thin/corner,
-/obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ruin/moon/moonbase/dorms)
 "kU" = (
-/obj/effect/turf_decal/siding/thinplating/corner,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/corner,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
@@ -1810,9 +1802,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/moon/moonbase/refinery)
 "oO" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 4
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 4
 	},
@@ -2881,7 +2870,6 @@
 /obj/structure/railing/thin/corner{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line,
 /obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3051,9 +3039,6 @@
 /obj/structure/railing/thin/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 1
 	},
@@ -3087,9 +3072,6 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/moon/moonbase/engineering)
 "Bz" = (
-/obj/effect/turf_decal/siding/thinplating/corner{
-	dir = 4
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/corner{
 	dir = 4
 	},
@@ -4494,9 +4476,6 @@
 /obj/structure/railing/thin/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 1
-	},
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line{
 	dir = 1
 	},
@@ -4668,7 +4647,6 @@
 /obj/structure/railing/thin/corner{
 	dir = 8
 	},
-/obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/transparent/blue/filled/line,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,