Merge branch 'master' into rockplanetimprovement

.github/CODEOWNERS

@@ -4,10 +4,6 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# Kapu1178
-/code/modules/mob/living/carbon/ @Kapu1178
-/code/modules/surgery/bodyparts/ @Kapu1178
-
 # MarkSuckerberg
 /code/controllers/subsystem/shuttle.dm @MarkSuckerberg
 /code/modules/shuttle/ @MarkSuckerberg

_maps/RandomRuins/IceRuins/icemoon_demonlab.dmm

@@ -145,10 +145,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/noslip,
 /area/ruin/powered/demonlab)
-"bb" = (
-/obj/machinery/suit_storage_unit/independent/engineering,
-/turf/open/floor/noslip,
-/area/ruin/powered/demonlab)
 "bf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -1341,7 +1337,7 @@ LK
 aH
 aP
 LK
-bb
+bh
 bg
 Yg
 bh

_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -212,7 +212,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/unpowered/corprejectengineering)
 "fS" = (
-/obj/item/fireaxe,
 /obj/structure/rack,
 /obj/item/gun/medbeam,
 /turf/open/floor/vault,
@@ -267,12 +266,6 @@
 /obj/item/ammo_casing/shotgun/incendiary{
 	pixel_y = 10
 	},
-/obj/item/ammo_casing/shotgun/incendiary{
-	pixel_y = -12
-	},
-/obj/item/ammo_casing/shotgun/incendiary{
-	pixel_x = -13
-	},
 /obj/structure/cable/blue{
 	icon_state = "1-5"
 	},
@@ -372,15 +365,9 @@
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectrooms)
 "jy" = (
-/mob/living/simple_animal/slaughter{
-	faction = list("DeserterNT");
-	name = "Jack";
-	real_name = "Glorious Jonathon"
-	},
-/mob/living/simple_animal/hostile/cult_demon/greater{
+/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
 	faction = list("DeserterNT");
-	name = "Jack";
-	real_name = "Glorious Jonathon"
+	name = "Jimmothy"
 	},
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
@@ -504,6 +491,10 @@
 "ni" = (
 /obj/machinery/power/apc/auto_name/south,
 /obj/structure/cable/blue,
+/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
+	faction = list("DeserterNT");
+	name = "Dell"
+	},
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "nk" = (
@@ -1309,16 +1300,9 @@
 	pixel_x = -7;
 	pixel_y = 11
 	},
-/obj/item/ammo_casing/shotgun/dragonsbreath{
-	pixel_x = 10;
-	pixel_y = -5
-	},
 /obj/item/ammo_casing/shotgun/dragonsbreath{
 	pixel_y = 6
 	},
-/obj/item/ammo_casing/shotgun/dragonsbreath{
-	pixel_x = 12
-	},
 /obj/structure/cable/blue{
 	icon_state = "1-9"
 	},
@@ -1348,7 +1332,6 @@
 /obj/item/gun/ballistic/automatic/proto,
 /obj/structure/rack,
 /obj/item/firing_pin,
-/obj/item/gun/energy/beam_rifle,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "Er" = (
@@ -1529,12 +1512,6 @@
 /obj/item/ammo_casing/shotgun/buckshot{
 	pixel_x = -9
 	},
-/obj/item/ammo_casing/shotgun/buckshot{
-	pixel_y = 7
-	},
-/obj/item/ammo_casing/shotgun/buckshot{
-	pixel_x = 5
-	},
 /obj/structure/cable/blue{
 	icon_state = "1-2"
 	},
@@ -1591,14 +1568,6 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered/corprejectrooms)
 "Jk" = (
-/obj/item/ammo_casing/shotgun/laserslug{
-	pixel_x = 8;
-	pixel_y = -12
-	},
-/obj/item/ammo_casing/shotgun/laserslug{
-	pixel_x = 12;
-	pixel_y = -12
-	},
 /obj/item/ammo_casing/shotgun/laserslug{
 	pixel_x = 10
 	},
@@ -1625,7 +1594,6 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/stock_parts/cell/gun/upgraded,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "Kk" = (
@@ -1641,7 +1609,6 @@
 /obj/item/poster/random_official,
 /obj/item/poster/random_official,
 /obj/structure/table/glass,
-/obj/item/slimepotion/slime/sentience,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "KF" = (
@@ -1651,10 +1618,9 @@
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "Lo" = (
-/mob/living/simple_animal/hostile/cult_demon{
+/mob/living/simple_animal/bot/secbot/ed209/rockplanet{
 	faction = list("DeserterNT");
-	name = "Jill";
-	real_name = "Jolly Janie"
+	name = "Phillip"
 	},
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
@@ -1729,7 +1695,7 @@
 /area/ruin/unpowered/corprejectrooms)
 "Mc" = (
 /obj/structure/table/glass,
-/obj/item/gun_voucher,
+/obj/item/fireaxe,
 /turf/open/floor/vault,
 /area/ruin/unpowered/corprejectvault)
 "Mh" = (

_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm

@@ -586,8 +586,6 @@
 /obj/item/ammo_casing/shotgun/improvised,
 /obj/item/ammo_casing/shotgun/buckshot,
 /obj/item/ammo_casing/shotgun/buckshot,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/wood/icecropolis,
 /area/ruin/unpowered/icecropolis/russia)
 "lH" = (
@@ -1087,7 +1085,7 @@
 "uE" = (
 /obj/structure/stone_tile/slab,
 /obj/structure/table/wood/fancy/royalblue,
-/obj/item/gun/magic/staff/healing,
+/obj/item/dragons_blood,
 /turf/open/indestructible/boss/air,
 /area/ruin/unpowered/icecropolis)
 "uF" = (
@@ -1180,12 +1178,6 @@
 /obj/structure/toilet,
 /turf/open/floor/wood/icecropolis,
 /area/ruin/unpowered/icecropolis/russia)
-"wd" = (
-/obj/item/dragons_blood,
-/obj/structure/stone_tile/slab,
-/obj/structure/table/wood/fancy/royalblue,
-/turf/open/indestructible/boss/air,
-/area/ruin/unpowered/icecropolis)
 "wf" = (
 /mob/living/simple_animal/hostile/asteroid/goliath/beast,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/icecropolis/inside,
@@ -2059,10 +2051,7 @@
 "LH" = (
 /obj/structure/stone_tile/slab/cracked,
 /obj/structure/table/wood/fancy/red_gold,
-/obj/item/stack/sheet/mineral/adamantine{
-	amount = 15
-	},
-/obj/item/pickaxe/drill/cyborg,
+/obj/item/shield/adamantineshield,
 /turf/open/indestructible/boss/air,
 /area/ruin/unpowered/icecropolis/gold)
 "LL" = (
@@ -2199,7 +2188,6 @@
 /obj/structure/stone_tile/slab/cracked,
 /obj/structure/table/wood/fancy/red_gold,
 /obj/item/clothing/suit/armor/heavy/adamantine,
-/obj/item/shield/adamantineshield,
 /turf/open/indestructible/boss/air,
 /area/ruin/unpowered/icecropolis/gold)
 "Os" = (
@@ -2842,14 +2830,9 @@
 /obj/item/gun/energy/kinetic_accelerator,
 /obj/item/borg/upgrade/modkit/cooldown,
 /obj/item/borg/upgrade/modkit/damage,
-/obj/item/borg/upgrade/modkit/damage,
 /obj/item/borg/upgrade/modkit/indoors,
 /obj/item/borg/upgrade/modkit/range,
 /obj/item/borg/upgrade/modkit/trigger_guard,
-/obj/item/borg/upgrade/modkit/aoe/turfs,
-/obj/item/storage/box/contractor/fulton_extraction,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/survivalcapsule/luxury,
 /obj/item/rcd_ammo,
 /obj/item/gps,
 /turf/open/floor/plating,
@@ -2900,13 +2883,13 @@
 /area/ruin/unpowered/icecropolis/gold)
 "Zf" = (
 /obj/structure/closet/crate,
-/obj/item/gun/ballistic/rifle/boltaction,
 /obj/item/clothing/mask/russian_balaclava,
 /obj/item/clothing/shoes/russian,
 /obj/item/clothing/suit/armor/vest/russian,
 /obj/item/clothing/head/helmet/rus_helmet,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/under/color/black,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/wood/icecropolis,
 /area/ruin/unpowered/icecropolis/russia)
 "Zh" = (
@@ -3634,7 +3617,7 @@ VV
 Qf
 VV
 zA
-wd
+VU
 VV
 VU
 Il

_maps/configs/diy.json

@@ -0,0 +1,17 @@
+{
+	"map_name": "BYO-class Do-It-Yourself Enthusiast Special",
+	"map_short_name": "BYO-class",
+	"map_path": "_maps/shuttles/shiptest/diy.dmm",
+	"map_id": "byo_a",
+	"job_slots": {
+		"Architect": {
+			"outfit": "/datum/outfit/job/engineer/hazard",
+			"slots": 1
+		},
+		"Maso-Mechanic": {
+			"outfit": "/datum/outfit/job/engineer/hazard",
+			"slots": 4
+		}
+	},
+	"cost": 100
+}

_maps/configs/minutemen_carina.json

@@ -0,0 +1,42 @@
+{
+	"map_name": "Carina-Class Patrol Cutter",
+	"prefix": "CMSV",
+	"namelists": ["GENERAL", "BRITISH_NAVY", "MYTHOLOGICAL", "BEASTS"],
+	"map_short_name": "Carina-class",
+	"map_path": "_maps/shuttles/shiptest/minutemen_carina.dmm",
+	"map_id": "minutemen_carina",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/captain/minutemen",
+			"officer": true,
+			"slots": 1
+		},
+		"Bridge Officer": {
+			"outfit": "/datum/outfit/job/head_of_personnel/minutemen",
+			"officer": true,
+			"slots": 1
+		},
+		"Field Medic": {
+			"outfit": "/datum/outfit/job/doctor/minutemen",
+			"slots": 1
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/engineer/minutemen",
+			"slots": 1
+		},
+		"Armorer": {
+			"outfit": "/datum/outfit/job/warden/minutemen",
+			"slots": 1
+		},
+		"Minuteman": {
+			"outfit": "/datum/outfit/job/security/minutemen",
+			"slots": 3
+		},
+		"Cadet": {
+			"outfit": "/datum/outfit/job/assistant/minutemen",
+			"slots": 5
+		}
+	},
+	"cost": 750
+}

_maps/shuttles/shiptest/cargotide.dmm

@@ -541,7 +541,7 @@
 /obj/machinery/cryopod{
 	close_state = "crate";
 	dir = 8;
-	icon = 'goon/icons/obj/crates.dmi';
+	icon = 'icons/obj/crates.dmi';
 	icon_state = "crateopen";
 	open_state = "crateopen"
 	},
@@ -996,7 +996,7 @@
 /obj/machinery/cryopod{
 	close_state = "crate";
 	dir = 8;
-	icon = 'goon/icons/obj/crates.dmi';
+	icon = 'icons/obj/crates.dmi';
 	icon_state = "crateopen";
 	open_state = "crateopen"
 	},