adds wip shipmap, shuttle, code for both

also fixes some role allocation issues
Neroid-Sector · Sep 6, 2024 · 1d01590 · 1d01590
1 parent dea4e06
commit 1d01590
Show file tree

Hide file tree

Showing 14 changed files with 1,227 additions and 5 deletions.
diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -117,6 +117,7 @@
 #define DROPSHIP_NORMANDY "dropship_normandy"
 #define DROPSHIP_UPP "dropship_upp"
 #define DROPSHIP_CYCLONE "dropship_cyclone"
+#define DROPSHIP_WRAITH "dropship_wraith"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"

diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
@@ -231,3 +231,16 @@
 /area/shuttle/distress/arrive_s_engi
 	name = "\improper VIP Shuttle"
 	icon_state = "away2"
+
+/area/shuttle/wraith
+	name = "dropship Wraith"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/wraith/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
@@ -715,7 +715,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 						if(!lowest)
 							lowest = S
 		if(!lowest)
-			var/ranpick = rand(1,4)
+			var/ranpick = rand(1,2)
 			lowest = mixed_squads[ranpick]
 		if(lowest) lowest.put_marine_in_squad(H)
 		else to_chat(H, "Something went badly with randomize_squad()! Tell a coder!")

diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -346,6 +346,9 @@
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2/cyclone
 	name = "\improper Cyclone crew hatch"
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2/wraith
+	name = "\improper Wraith crew hatch"
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp
 	name = "\improper Akademia Nauk cargo door"
 	icon = 'icons/obj/structures/doors/dropshipupp_cargo.dmi'

diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
@@ -290,6 +290,14 @@
 /turf/closed/shuttle/cyclone/transparent
 	opacity = FALSE
 
+/turf/closed/shuttle/wraith
+	name = "\improper Wraith"
+	icon = 'icons/turf/dropship2.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/wraith/transparent
+	opacity = FALSE
+
 /turf/closed/shuttle/twe_dropship
 	name = "\improper UD4-UK"
 	icon = 'icons/turf/twedropship.dmi'

diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm
@@ -249,6 +249,10 @@
 	shuttle_tag = DROPSHIP_CYCLONE
 	dir = SOUTH
 
+/turf/open/space/transit/dropship/wraith
+	shuttle_tag = DROPSHIP_WRAITH
+	dir = SOUTH
+
 /turf/open/space/transit/south
 	dir = SOUTH
 

diff --git a/code/global.dm b/code/global.dm
@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 #define MAIN_SHIP_NAME SSmapping.get_main_ship_name()
-#define MAIN_SHIP_DEFAULT_NAME "USS Golden Arrow"
-#define SHIP_MAP_NAMES list("USS Almayer", "USS Golden Arrow",  "USS Golden Arrow (Classic)", "SSV Chapaev", "USS Rover")
+#define MAIN_SHIP_DEFAULT_NAME "USS Arrowhead"
+#define SHIP_MAP_NAMES list("UAS Arrowhead")
 
 #define MAIN_SHIP_PLATOON text2path(SSmapping.get_main_ship_platoon())
 #define MAIN_SHIP_DEFAULT_PLATOON "/datum/squad/marine/alpha"

diff --git a/code/modules/gear_presets/xenosurge.dm b/code/modules/gear_presets/xenosurge.dm
@@ -32,6 +32,7 @@
 	access = list(ACCESS_MARINE_PREP)
 	assignment = JOB_UER_MARINE
 	rank = JOB_UER_MARINE
+	faction = FACTION_MARINE
 	paygrade = "ME3"
 	role_comm_title = "OPR"
 	skills = /datum/skills/pve/standard
@@ -76,6 +77,7 @@
 	access = list(ACCESS_MARINE_PREP)
 	assignment = JOB_UER_MARINE_POINT
 	rank = JOB_UER_MARINE_POINT
+	faction = FACTION_MARINE
 	paygrade = "ME4"
 	role_comm_title = "PNT"
 	skills = /datum/skills/pve/standard
@@ -121,6 +123,7 @@
 	access = list(ACCESS_MARINE_PREP)
 	assignment = JOB_UER_MARINE_LEAD
 	rank = JOB_UER_MARINE_LEAD
+	faction = FACTION_MARINE
 	paygrade = "ME5"
 	role_comm_title = "TML"
 	skills = /datum/skills/pve/standard

diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm
@@ -151,6 +151,15 @@
 	dwidth = 4
 	dheight = 8
 
+/obj/docking_port/mobile/marine_dropship/wraith
+	name = "Wraith"
+	id = DROPSHIP_WRAITH
+	width = 9
+	height = 18
+
+	dwidth = 4
+	dheight = 8
+
 /obj/docking_port/mobile/marine_dropship/cyclone/get_transit_path_type()
 	return /turf/open/space/transit/dropship/cyclone
 
@@ -324,6 +333,12 @@
 	auto_open = TRUE
 	roundstart_template = /datum/map_template/shuttle/midway
 
+/obj/docking_port/stationary/marine_dropship/arrowhead_hangar
+	name = "Wraith Launch Bay"
+	id = GOLDEN_ARROW_LZ
+	auto_open = TRUE
+	roundstart_template = /datum/map_template/shuttle/wraith
+
 /obj/docking_port/stationary/marine_dropship/crash_site
 	auto_open = TRUE
 
@@ -368,3 +383,7 @@
 /datum/map_template/shuttle/cyclone
 	name = "Cyclone"
 	shuttle_id = DROPSHIP_CYCLONE
+
+/datum/map_template/shuttle/wraith
+	name = "Wraith"
+	shuttle_id = DROPSHIP_WRAITH
diff --git a/map_config/shipmaps.txt b/map_config/shipmaps.txt
@@ -17,14 +17,21 @@ map almayer
 endmap
 
 map golden_arrow
-	default
+	disabled
 endmap
 
 map chapaev
+	disabled
 endmap
 
 map rover
+	disabled
 endmap
 
 map golden_arrow_classic
-endmap
+	disabled
+endmap
+
+map arrowhead
+	default
+endmap
diff --git a/maps/arrowhead.json b/maps/arrowhead.json
@@ -0,0 +1,8 @@
+{
+    "map_name": "UAS Arrowhead",
+    "map_path": "map_files/UAS_Arrowhead",
+    "map_file": "UAS_Arrowhead.dmm",
+    "webmap_url": "UASArrowhead",
+    "traits": [{"Marine Main Ship": true}],
+    "nightmare_path": "maps/Nightmare/maps/UAS_Arrowhead/"
+}