Merge pull request DaedalusDock#5 from pariahstation/upstream-fetch-1

Upstream Batch Fetch DaedalusDock#1

Author: OctusGit

.github/CODEOWNERS

@@ -9,7 +9,7 @@
 # Cobby
 /code/modules/reagents/ @ExcessiveUseOfCobblestone
 /code/modules/research/designs/medical_designs.dm @ExcessiveUseOfCobblestone
-/code/game/objects/items/storage/firstaid.dm @ExcessiveUseOfCobblestone
+/code/game/objects/items/storage/medkit.dm @ExcessiveUseOfCobblestone
 
 # Cyberboss
 

_maps/RandomRuins/AnywhereRuins/golem_ship.dmm

@@ -147,31 +147,31 @@
 /obj/item/surgical_drapes{
 	pixel_x = 15
 	},
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/fire,
+/obj/item/storage/medkit/fire,
+/obj/item/storage/medkit/fire,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "B" = (
-/obj/item/storage/firstaid/fire,
+/obj/item/storage/medkit/fire,
 /obj/structure/table/wood,
-/obj/item/storage/firstaid/fire,
+/obj/item/storage/medkit/fire,
 /obj/machinery/light/directional/south,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "C" = (
-/obj/item/storage/firstaid/brute,
+/obj/item/storage/medkit/brute,
 /obj/structure/table/wood,
-/obj/item/storage/firstaid/brute,
+/obj/item/storage/medkit/brute,
 /obj/item/areaeditor/blueprints{
 	desc = "Use to build new structures in the wastes.";
 	name = "land claim"
 	},
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "D" = (
-/obj/item/storage/firstaid/brute,
+/obj/item/storage/medkit/brute,
 /obj/structure/table/wood,
-/obj/item/storage/firstaid/brute,
+/obj/item/storage/medkit/brute,
 /obj/item/disk/design_disk/golem_shell,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -1547,8 +1547,8 @@
 "zb" = (
 /obj/structure/rack,
 /obj/structure/window/reinforced/spawner/north,
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/regular{
+/obj/item/storage/medkit/fire,
+/obj/item/storage/medkit/regular{
 	pixel_x = -3;
 	pixel_y = -3
 	},

_maps/RandomRuins/IceRuins/icemoon_underground_hermit.dmm

@@ -73,7 +73,7 @@
 /area/ruin/powered/shuttle)
 "EV" = (
 /obj/item/storage/bag/plants/portaseeder,
-/obj/item/storage/firstaid/medical,
+/obj/item/storage/medkit/surgery,
 /obj/item/storage/bag/ore,
 /obj/structure/table/wood,
 /turf/open/floor/grass/fairy,

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

@@ -1206,8 +1206,8 @@
 	},
 /obj/item/bikehorn/airhorn,
 /obj/structure/table/wood,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/brute,
+/obj/item/storage/medkit/regular,
+/obj/item/storage/medkit/brute,
 /turf/open/floor/wood,
 /area/ruin/powered/beach)
 "NJ" = (