Merge branch 'cmss13-devs:master' into Eating-RolePlay

cmss13-devs · Aug 22, 2024 · e18a33a · e18a33a
2 parents 3020d95 + 32578a7
commit e18a33a
Show file tree

Hide file tree

Showing 40 changed files with 4,902 additions and 1,434 deletions.
diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm
@@ -7,6 +7,10 @@
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
 #define CAMERA_NET_MIDWAY "Midway"
+#define CAMERA_NET_CYCLONE "Cyclone"
+#define CAMERA_NET_TORNADO "Tornado"
+#define CAMERA_NET_TYPHOON "Typhoon"
+#define CAMERA_NET_TRIPOLI "Tripoli"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
@@ -117,6 +117,9 @@
 #define DROPSHIP_NORMANDY "dropship_normandy"
 #define DROPSHIP_UPP "dropship_upp"
 #define DROPSHIP_CYCLONE "dropship_cyclone"
+#define DROPSHIP_TORNADO "dropship_tornado"
+#define DROPSHIP_TYPHOON "dropship_typhoon"
+#define DROPSHIP_TRIPOLI "dropship_tripoli"
 
 #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
@@ -150,6 +150,47 @@
 	return TRUE
 
 
+/area/shuttle/tornado
+	name = "command dropship Tornado"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/tornado/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+/area/shuttle/typhoon
+	name = "heavy-lift dropship Typhoon"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/typhoon/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+/area/shuttle/tripoli
+	name = "dropship Tripoli"
+	icon_state = "shuttlered"
+	base_muffle = MUFFLE_HIGH
+	soundscape_interval = 30
+	is_landing_zone = TRUE
+	ceiling = CEILING_REINFORCED_METAL
+
+/area/shuttle/tripoli/Enter(atom/movable/O, atom/oldloc)
+	if(istype(O, /obj/structure/barricade))
+		return FALSE
+	return TRUE
+
+
+
 //DISTRESS SHUTTLES
 
 /area/shuttle/distress

diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
@@ -120,6 +120,18 @@
 /obj/structure/machinery/camera/autoname/golden_arrow/midway
 	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_MIDWAY)
 
+/obj/structure/machinery/camera/autoname/golden_arrow/cyclone
+	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_CYCLONE)
+
+/obj/structure/machinery/camera/autoname/golden_arrow/tornado
+	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_TORNADO)
+
+/obj/structure/machinery/camera/autoname/golden_arrow/typhoon
+	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_TYPHOON)
+
+/obj/structure/machinery/camera/autoname/golden_arrow/tripoli
+	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_TRIPOLI)
+
 //used by the landing camera dropship equipment. Do not place them right under where the dropship lands.
 //Should place them near each corner of your LZs.
 /obj/structure/machinery/camera/autoname/lz_camera

diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
@@ -313,4 +313,20 @@
 	name = "\improper 'Midway' camera controls"
 	network = list(CAMERA_NET_MIDWAY, CAMERA_NET_LASER_TARGETS)
 
+/obj/structure/machinery/computer/cameras/dropship/cyclone
+	name = "\improper 'Cyclone' camera controls"
+	network = list(CAMERA_NET_CYCLONE, CAMERA_NET_LASER_TARGETS)
+
+/obj/structure/machinery/computer/cameras/dropship/tornado
+	name = "\improper 'Tornado' camera controls"
+	network = list(CAMERA_NET_TORNADO, CAMERA_NET_LASER_TARGETS)
+
+/obj/structure/machinery/computer/cameras/dropship/typhoon
+	name = "\improper 'Typhoon' camera controls"
+	network = list(CAMERA_NET_TYPHOON, CAMERA_NET_LASER_TARGETS)
+
+/obj/structure/machinery/computer/cameras/dropship/tripoli
+	name = "\improper 'Tripoli' camera controls"
+	network = list(CAMERA_NET_TRIPOLI, CAMERA_NET_LASER_TARGETS)
+
 #undef DEFAULT_MAP_SIZE
diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm
@@ -896,6 +896,63 @@
 	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
 	shuttle_tag = DROPSHIP_MIDWAY
 
+/obj/structure/machinery/computer/dropship_weapons/midway/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+	density = FALSE
+
+/obj/structure/machinery/computer/dropship_weapons/cyclone
+	name = "\improper 'Cyclone' weapons controls"
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	shuttle_tag = DROPSHIP_CYCLONE
+
+/obj/structure/machinery/computer/dropship_weapons/cyclone/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+	density = FALSE
+
+/obj/structure/machinery/computer/dropship_weapons/tornado
+	name = "\improper 'Tornado' weapons controls"
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	shuttle_tag = DROPSHIP_TORNADO
+
+/obj/structure/machinery/computer/dropship_weapons/tornado/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+	density = FALSE
+
+/obj/structure/machinery/computer/dropship_weapons/typhoon
+	name = "\improper 'Typhoon' weapons controls"
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	shuttle_tag = DROPSHIP_TYPHOON
+
+/obj/structure/machinery/computer/dropship_weapons/typhoon/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+	density = FALSE
+
+/obj/structure/machinery/computer/dropship_weapons/tripoli
+	name = "\improper 'Tripoli' weapons controls"
+	req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP, ACCESS_WY_FLIGHT)
+	firemission_envelope = new /datum/cas_fire_envelope/uscm_dropship()
+	shuttle_tag = DROPSHIP_TRIPOLI
+
+/obj/structure/machinery/computer/dropship_weapons/tripoli/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+	density = FALSE
+
+/obj/structure/machinery/computer/dropship_weapons/dropship1
+	name = "\improper 'Alamo' weapons controls"
+	shuttle_tag = DROPSHIP_ALAMO
+
+/obj/structure/machinery/computer/dropship_weapons/dropship2
+	name = "\improper 'Normandy' weapons controls"
+	shuttle_tag = DROPSHIP_NORMANDY
+
 /obj/structure/machinery/computer/dropship_weapons/Destroy()
 	. = ..()
 	QDEL_NULL(firemission_envelope)

diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
@@ -905,6 +905,9 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit/two
 	icon = 'icons/obj/structures/doors/dropship2_pilot.dmi'
 
+/obj/structure/machinery/door/airlock/hatch/cockpit/four
+	icon = 'icons/obj/structures/doors/dropship4_pilot.dmi'
+
 /obj/structure/machinery/door/airlock/hatch/cockpit/upp
 	icon = 'icons/obj/structures/doors/dropshipupp_pilot.dmi'
 

diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -329,6 +329,10 @@
 	name = "\improper Normandy cargo door"
 	icon = 'icons/obj/structures/doors/dropship2_cargo.dmi'
 
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/ds4
+	name = "\improper Midway cargo door"
+	icon = 'icons/obj/structures/doors/dropship4_cargo.dmi'
+
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside
 	width = 2
 

diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
@@ -315,7 +315,7 @@
 	name = "dual purpose rappel-fulton harness"
 	desc = "A fulton Surface To Air Recovery System (STARS). Special latch/hook assembly allows for aircraft on flyby equipped with a rappel system to pick up the attached item or person. The complex assembly of venlar rigging and secured buckles takes some time to set up though."
 	icon_state = "rappel_harness_adv"
-	var/shuttle_id = DROPSHIP_MIDWAY
+	var/shuttle_id
 	actions_types = list(/datum/action/item_action/STARS)
 
 /obj/item/rappel_harness/extract/proc/try_extract(mob/living/carbon/human/user)
@@ -403,3 +403,24 @@
 		return
 
 	harness.try_extract(H)
+
+/obj/item/rappel_harness/extract/midway
+	shuttle_id = DROPSHIP_MIDWAY
+
+/obj/item/rappel_harness/extract/cyclone
+	shuttle_id = DROPSHIP_CYCLONE
+
+/obj/item/rappel_harness/extract/typhoon
+	shuttle_id = DROPSHIP_TYPHOON
+
+/obj/item/rappel_harness/extract/tornado
+	shuttle_id = DROPSHIP_TORNADO
+
+/obj/item/rappel_harness/extract/tripoli
+	shuttle_id = DROPSHIP_TRIPOLI
+
+/obj/item/rappel_harness/extract/alamo
+	shuttle_id = DROPSHIP_ALAMO
+
+/obj/item/rappel_harness/extract/normandy
+	shuttle_id = DROPSHIP_NORMANDY
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -367,6 +367,13 @@
 /obj/structure/bed/chair/dropship/passenger/shuttle_chair
 	icon_state = "hotseat"
 
+/obj/structure/bed/chair/dropship/passenger/folded
+
+/obj/structure/bed/chair/dropship/passenger/folded/Initialize()
+	. = ..()
+	fold_down()
+
+
 /obj/structure/bed/chair/dropship/passenger/BlockedPassDirs(atom/movable/mover, target_dir, height = 0, air_group = 0)
 	if(chair_state == DROPSHIP_CHAIR_UNFOLDED && istype(mover, /obj/vehicle/multitile) && !is_animating)
 		visible_message(SPAN_DANGER("[mover] slams into [src] and breaks it!"))
@@ -413,7 +420,7 @@
 			chair_state = DROPSHIP_CHAIR_BROKEN
 		else
 			chair_state = DROPSHIP_CHAIR_FOLDED
-		addtimer(VARSET_CALLBACK(src, icon_state, "hotseat_new_folded"), 5) // animation length
+		addtimer(VARSET_CALLBACK(src, icon_state, "hotseat_new_folded"), 22) // animation length
 
 /obj/structure/bed/chair/dropship/passenger/shuttle_chair/fold_down(break_it = 1)
 	if(chair_state == DROPSHIP_CHAIR_UNFOLDED)

diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
@@ -276,7 +276,7 @@
 
 /turf/closed/shuttle/midway
 	name = "\improper Midway"
-	icon = 'icons/turf/dropship.dmi'
+	icon = 'icons/turf/dropship4.dmi'
 	icon_state = "1"
 
 /turf/closed/shuttle/midway/transparent
@@ -290,6 +290,30 @@
 /turf/closed/shuttle/cyclone/transparent
 	opacity = FALSE
 
+/turf/closed/shuttle/typhoon
+	name = "\improper Typhoon"
+	icon = 'icons/turf/dropship3.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/typhoon/transparent
+	opacity = FALSE
+
+/turf/closed/shuttle/tornado
+	name = "\improper Tornado"
+	icon = 'icons/turf/dropship3.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/tornado/transparent
+	opacity = FALSE
+
+/turf/closed/shuttle/tripoli
+	name = "\improper Tripoli"
+	icon = 'icons/turf/dropship.dmi'
+	icon_state = "1"
+
+/turf/closed/shuttle/tripoli/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,18 @@
 	shuttle_tag = DROPSHIP_CYCLONE
 	dir = SOUTH
 
+/turf/open/space/transit/dropship/tornado
+	shuttle_tag = DROPSHIP_TORNADO
+	dir = SOUTH
+
+/turf/open/space/transit/dropship/typhoon
+	shuttle_tag = DROPSHIP_TYPHOON
+	dir = SOUTH
+
+/turf/open/space/transit/dropship/tripoli
+	shuttle_tag = DROPSHIP_TRIPOLI
+	dir = SOUTH
+
 /turf/open/space/transit/south
 	dir = SOUTH
 

diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm
@@ -10,6 +10,10 @@
 	pockets.max_storage_space = 4
 	flags_atom |= USES_HEARING
 
+/obj/item/clothing/suit/storage/Destroy()
+	QDEL_NULL(pockets)
+	return ..()
+
 /obj/item/clothing/suit/storage/get_pockets()
 	if(pockets)
 		return pockets

diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -920,6 +920,8 @@
 	icon_state = "toc"
 	bound_width = 64
 	bound_height = 32
+	layer = ABOVE_TABLE_LAYER
+	density = TRUE
 
 /obj/structure/supply_drop
 	name = "Supply Drop Pad"

diff --git a/code/modules/cm_phone/phone_base.dm b/code/modules/cm_phone/phone_base.dm
@@ -99,3 +99,7 @@
 	name = "rotary telephone"
 	icon_state = "rotary_phone"
 	desc = "The finger plate is a little stiff."
+
+/obj/structure/phone_base/toc
+	name = "telephone receiver"
+	icon = 'icons/obj/vehicles/interiors/movie.dmi'
diff --git a/code/modules/cm_tech/implements/railgun.dm b/code/modules/cm_tech/implements/railgun.dm
@@ -280,7 +280,7 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords)
 	desc = "The younger sister to the railgun, this one is way weaker, however, it fires significantly faster. The higher your altitude, the faster your reload, and slower the shots hit."
 	max_ammo = 100
 	ammo = 100
-	ammo_recharge_time = 1 SECONDS
+	ammo_recharge_time = 2 SECONDS
 	fire_cooldown = 0.1 SECONDS
 	ammo_delay = 3 SECONDS
 	power = 50
@@ -293,13 +293,14 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords)
 	desc = "An Orbital cannon with a very long recharge time. The higher your altitude, the faster your reload, and slower the shots hit."
 	max_ammo = 1
 	ammo = 1
-	ammo_recharge_time = 1 SECONDS
+	ammo_recharge_time = 5 SECONDS
 	fire_cooldown = 10 MINUTES	//So you know how long it takes betweenS
 	ammo_delay = 30 SECONDS
 	power = 1500
 	range = 15
 	warning_color = "#ff0000"
 
+
 /obj/structure/machinery/computer/railgun/napalm
 	name = "orbital napalm computer"
 	desc = "An Orbital cannon with a very long recharge time. The higher your altitude, the faster your reload, and slower the shots hit."
@@ -317,3 +318,11 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords)
 		firer.images -= to_remove
 		playsound(T, 'sound/machines/railgun/railgun_impact.ogg', sound_range = 75)
 		INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flame_radius), create_cause_data("railgun", firer.mob), 5, T, BURN_TIME_TIER_5 + 5, BURN_LEVEL_TIER_2, FLAMESHAPE_DEFAULT, FIRE_VARIANT_TYPE_B)
+
+/obj/structure/machinery/computer/railgun/toc
+	name = "railgun computer screen"
+	icon_state = "toc_railgun"
+
+/obj/structure/machinery/computer/railgun/gatling/toc
+	name = "gatling-gun computer screen"
+	icon_state = "toc_railcannon"