Merge pull request #71 from Aurorastation/once_and_for_all

Ghost spawners now move with the ship + orion shuttle docking + other fixes in commits

code/modules/client/preference_setup/loadout/loadout_factions.dm

@@ -134,13 +134,13 @@
 	display_name = "eridani beret"
 	path = /obj/item/clothing/head/beret/security/eri
 	slot = slot_head
-	faction = "Eridani Private Military Contractors"
+	faction = "Private Military Contracting Group"
 
 /datum/gear/faction/eridani_cap
 	display_name = "eridani cap"
 	path = /obj/item/clothing/head/softcap/eri
 	slot = slot_head
-	faction = "Eridani Private Military Contractors"
+	faction = "Private Military Contracting Group"
 
 /datum/gear/faction/epmc_sunglasses
 	display_name = "EPMC security HUD selection"
@@ -148,7 +148,7 @@
 	path = /obj/item/clothing/glasses/sunglasses/sechud/epmc
 	slot = slot_glasses
 	allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
-	faction = "Eridani Private Military Contractors"
+	faction = "Private Military Contracting Group"
 
 /datum/gear/faction/epmc_sunglasses/New()
 	..()
@@ -163,7 +163,7 @@
 	description = "A selection of EPMC labcoats."
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
 	slot = slot_wear_suit
-	faction = "Eridani Private Military Contractors"
+	faction = "Private Military Contracting Group"
 
 /datum/gear/faction/epmc_labcoat/New()
 	..()
@@ -240,7 +240,7 @@
 	display_name = "EPMC sleeve patch"
 	path = /obj/item/clothing/accessory/sleevepatch/erisec
 	slot = slot_tie
-	faction = "Eridani Private Military Contractors"
+	faction = "Private Military Contracting Group"
 
 /datum/gear/faction/idrissec_patch
 	display_name = "idris security sleeve patch"

code/modules/ghostroles/spawnpoint/spawnpoint.dm

@@ -13,6 +13,7 @@
 	unacidable = 1
 	simulated = 0
 	invisibility = 101
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 	var/identifier = null //identifier of this spawnpoint
 

maps/away/ships/corporate.dm

@@ -9,7 +9,7 @@
 	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/orion_express_ship, /datum/shuttle/autodock/overmap/orion_express_shuttle)
 
 /obj/effect/overmap/visitable/sector/orion_express_ship
-	name = "empty sector"
+	name = "Empty sector"
 	desc = "A sector with faint hints of previous ship presence."
 	in_space = 1
 

maps/away/ships/corporate_ship_ghostroles.dm

@@ -29,7 +29,7 @@
 
 	l_ear = /obj/item/device/radio/headset/ship
 
-	backpack_contents = list(/obj/item/storage/box/survival = 1)
+	backpack_contents = list(/obj/item/storage/box/survival = 1, /obj/item/storage/wallet/random = 1)
 
 /datum/outfit/admin/orion_express_courier/get_id_access()
 	return list(access_orion_express_ship, access_external_airlocks)

maps/away/ships/orion_express_ship.dmm

@@ -802,7 +802,9 @@
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/orion_express_shuttle)
 "piw" = (
-/obj/structure/closet/secure_closet/freezer/kitchen,
+/obj/structure/closet/secure_closet/freezer/kitchen{
+	req_access = list(201)
+	},
 /obj/item/reagent_containers/food/snacks/meat,
 /obj/item/reagent_containers/food/snacks/meat,
 /obj/item/reagent_containers/food/snacks/meat,
@@ -834,6 +836,19 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/orion_express_ship)
+"pwR" = (
+/obj/machinery/light{
+	dir = 1;
+	icon_state = "tube1"
+	},
+/obj/effect/floor_decal/corner_wide/beige{
+	dir = 5
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_y = 24
+	},
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/orion_express_ship)
 "pxS" = (
 /obj/effect/floor_decal/corner_wide/beige/full,
 /turf/simulated/floor/tiled/dark,
@@ -1142,9 +1157,7 @@
 "xwj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/obj/item/stack/material/cyborg/plasteel{
-	amount = 50
-	},
+/obj/item/stack/material/plasteel,
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/orion_express_ship)
 "xzv" = (
@@ -33675,7 +33688,7 @@ fRD
 ccm
 aUD
 riA
-drY
+pwR
 pjp
 hJi
 gNW

maps/sccv_horizon/placeholder-1_deck_1.dmm

@@ -4122,7 +4122,7 @@
 	},
 /area/maintenance/wing/port/deck1)
 "dTk" = (
-/obj/effect/shuttle_landmark/horizon/nav2,
+/obj/effect/shuttle_landmark/horizon/nav1,
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
 "dUK" = (
@@ -4517,10 +4517,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/engineering/lower)
 "ekm" = (
-/obj/effect/shuttle_landmark/distress/blue{
-	base_turf = /turf/simulated/floor/plating;
-	name = "Port Hangar"
-	},
+/obj/effect/shuttle_landmark/horizon/nav2,
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
 "ekt" = (
@@ -17285,7 +17282,10 @@
 /turf/simulated/floor/tiled,
 /area/hangar/auxiliary)
 "pMP" = (
-/obj/effect/shuttle_landmark/horizon/nav1,
+/obj/effect/shuttle_landmark/distress/blue{
+	base_turf = /turf/simulated/floor/plating;
+	name = "Port Hangar"
+	},
 /turf/simulated/floor/plating,
 /area/hangar/auxiliary)
 "pMX" = (
@@ -51703,8 +51703,8 @@ bJa
 bJa
 bJa
 bJa
+dTk
 bJa
-pMP
 bJa
 lnk
 bJa
@@ -53723,11 +53723,11 @@ bJa
 bJa
 bJa
 bJa
-bJa
-dTk
 ekm
 bJa
 bJa
+pMP
+bJa
 bJa
 bJa
 nyL