Merge upstream (#240)

## About The Pull Request Merge upstream ## Why It's Good For The Game New fixes and features
ss220club · Apr 29, 2024 · 01c960b · 01c960b
2 parents 3e9985f + 7e94402
commit 01c960b
Show file tree

Hide file tree

Showing 58 changed files with 406 additions and 236 deletions.
diff --git a/_maps/shuttles/arrival_birdshot.dmm b/_maps/shuttles/arrival_birdshot.dmm
@@ -62,13 +62,19 @@
 /obj/machinery/light/cold/directional/north,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
+"x" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
 "B" = (
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "F" = (
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "J" = (
@@ -128,20 +134,20 @@
 
 (1,1,1) = {"
 a
-Q
-Q
-Q
-Q
-Q
+x
+x
+x
+x
+x
 a
 "}
 (2,1,1) = {"
 a
-Q
+x
 f
 n
 R
-Q
+x
 a
 "}
 (3,1,1) = {"
@@ -172,22 +178,22 @@ B
 F
 "}
 (6,1,1) = {"
-Q
+x
 U
 B
 U
 B
 U
-Q
+x
 "}
 (7,1,1) = {"
-Q
+x
 U
 B
 U
 B
 U
-Q
+x
 "}
 (8,1,1) = {"
 V
@@ -204,7 +210,7 @@ Q
 L
 q
 w
-Q
+x
 a
 "}
 (10,1,1) = {"
@@ -217,22 +223,22 @@ q
 V
 "}
 (11,1,1) = {"
-Q
+x
 U
 B
 U
 B
 U
-Q
+x
 "}
 (12,1,1) = {"
-Q
+x
 U
 B
 U
 B
 U
-Q
+x
 "}
 (13,1,1) = {"
 F

diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
@@ -9,10 +9,12 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "e" = (

diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
@@ -39,6 +39,7 @@
 /area/shuttle/arrival)
 "ah" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "ai" = (
@@ -156,6 +157,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/iron/white,
 /area/shuttle/arrival)
 "ap" = (

diff --git a/_maps/shuttles/arrival_donut.dmm b/_maps/shuttles/arrival_donut.dmm
@@ -38,6 +38,7 @@
 /area/shuttle/arrival)
 "k" = (
 /obj/machinery/door/airlock/titanium,
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "l" = (
@@ -55,6 +56,7 @@
 /area/shuttle/arrival)
 "o" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "p" = (

diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm
@@ -16,6 +16,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/arrival)
 "ae" = (
@@ -99,6 +100,7 @@
 	dir = 8
 	},
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "ap" = (
@@ -298,6 +300,11 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/arrival)
+"lA" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
 "rV" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -349,7 +356,7 @@ aX
 aW
 aQ
 aY
-af
+lA
 "}
 (5,1,1) = {"
 ae
@@ -367,7 +374,7 @@ rV
 ay
 aV
 aN
-af
+lA
 "}
 (7,1,1) = {"
 af
@@ -376,7 +383,7 @@ rV
 az
 aV
 aN
-af
+lA
 "}
 (8,1,1) = {"
 af
@@ -385,7 +392,7 @@ rV
 ab
 aV
 aN
-af
+lA
 "}
 (9,1,1) = {"
 ac
@@ -435,9 +442,9 @@ ag
 (14,1,1) = {"
 ag
 ac
-af
-af
-af
+lA
+lA
+lA
 ac
 ag
 "}
diff --git a/_maps/shuttles/arrival_northstar.dmm b/_maps/shuttles/arrival_northstar.dmm
@@ -12,6 +12,7 @@
 /obj/machinery/door/airlock/survival_pod/glass{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
@@ -183,6 +184,7 @@
 /area/shuttle/arrival)
 "Z" = (
 /obj/effect/spawner/structure/window/survival_pod,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 

diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
@@ -9,10 +9,12 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Arrivals Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "d" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "e" = (
@@ -53,6 +55,7 @@
 	name = "Ship Shutters"
 	},
 /obj/effect/spawner/structure/window/reinforced/shuttle,
+/obj/structure/fans/tiny/invisible,
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "n" = (

diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm
@@ -79,13 +79,13 @@ SUBSYSTEM_DEF(polling)
 	for(var/mob/candidate_mob as anything in group)
 		if(!candidate_mob.client)
 			continue
-		// Universal opt-out for all players if it's for a role.
-		if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles)))
+		// Universal opt-out for all players.
+		if(!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles))
 			continue
 		// Opt-out for admins whom are currently adminned.
-		if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
+		if((!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
 			continue
-		if(role && !is_eligible(candidate_mob, role, check_jobban, ignore_category))
+		if(!is_eligible(candidate_mob, role, check_jobban, ignore_category))
 			continue
 
 		if(start_signed_up)

diff --git a/code/datums/components/sisyphus_awarder.dm b/code/datums/components/sisyphus_awarder.dm
@@ -5,6 +5,8 @@
 /datum/component/sisyphus_awarder
 	/// What poor sap is hauling this rock?
 	var/mob/living/sisyphus
+	/// Reference to a place where it all started.
+	var/turf/bottom_of_the_hill
 
 /datum/component/sisyphus_awarder/Initialize()
 	if (!istype(parent, /obj/item/boulder))
@@ -30,6 +32,7 @@
 	RegisterSignal(the_taker, COMSIG_ENTER_AREA, PROC_REF(on_bearer_changed_area))
 	RegisterSignal(the_taker, COMSIG_QDELETING, PROC_REF(on_dropped))
 	sisyphus = the_taker
+	bottom_of_the_hill = get_turf(the_taker)
 
 /// If you ever drop this shit you fail the challenge
 /datum/component/sisyphus_awarder/proc/on_dropped()
@@ -45,5 +48,21 @@
 		return
 	if (entered_area.type != /area/centcom/central_command_areas/evacuation)
 		return // Don't istype because taking pods doesn't count
+
 	chosen_one.client?.give_award(/datum/award/achievement/misc/sisyphus, chosen_one)
+	play_reward_scene()
+
 	qdel(src)
+
+/// Sends the player back to the Lavaland and plays a funny sound
+/datum/component/sisyphus_awarder/proc/play_reward_scene()
+	if(isnull(bottom_of_the_hill))
+		return // This probably shouldn't happen, but...
+
+	podspawn(list(
+		"path" = /obj/structure/closet/supplypod/centcompod/sisyphus,
+		"target" = get_turf(sisyphus),
+		"reverse_dropoff_coords" = list(bottom_of_the_hill.x, bottom_of_the_hill.y, bottom_of_the_hill.z),
+	))
+
+	SEND_SOUND(sisyphus, 'sound/ambience/music/sisyphus/sisyphus.ogg')
diff --git a/code/datums/eigenstate.dm b/code/datums/eigenstate.dm
@@ -119,8 +119,7 @@ GLOBAL_DATUM_INIT(eigenstate_manager, /datum/eigenstate_manager, new)
 		spark_time = world.time
 	//Calls a special proc for the atom if needed (closets use bust_open())
 	SEND_SIGNAL(eigen_target, COMSIG_EIGENSTATE_ACTIVATE)
-	if(!subtle)
-		return COMPONENT_CLOSET_INSERT_INTERRUPT
+	return COMPONENT_CLOSET_INSERT_INTERRUPT
 
 ///Prevents tool use on the item
 /datum/eigenstate_manager/proc/tool_interact(atom/source, mob/user, obj/item/item)

diff --git a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
@@ -294,7 +294,7 @@
 
 /// Make our arm do slashing effects
 /datum/status_effect/golem/diamond/proc/set_arm_fluff(obj/item/bodypart/arm/arm)
-	arm.unarmed_attack_verb = "slash"
+	arm.unarmed_attack_verbs = list("slash")
 	arm.grappled_attack_verb = "lacerate"
 	arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW
 	arm.unarmed_attack_sound = 'sound/weapons/slash.ogg'
@@ -315,7 +315,7 @@
 /datum/status_effect/golem/diamond/proc/reset_arm_fluff(obj/item/bodypart/arm/arm)
 	if (!arm)
 		return
-	arm.unarmed_attack_verb = initial(arm.unarmed_attack_verb)
+	arm.unarmed_attack_verbs = initial(arm.unarmed_attack_verbs)
 	arm.unarmed_attack_effect = initial(arm.unarmed_attack_effect)
 	arm.unarmed_attack_sound = initial(arm.unarmed_attack_sound)
 	arm.unarmed_miss_sound = initial(arm.unarmed_miss_sound)

diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm
@@ -24,10 +24,7 @@
 
 /obj/item/storage/box/material/Initialize(mapload)
 	. = ..()
-	atom_storage.allow_big_nesting = TRUE
-	atom_storage.max_slots = 99
-	atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC
-	atom_storage.max_total_storage = 99
+	atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC //This needs to be set here too because the parent type overrides it again
 
 /obj/item/storage/box/material/PopulateContents() //less uranium because radioactive
 	var/static/items_inside = list(
@@ -51,6 +48,11 @@
 		/obj/item/stack/sheet/plastic/fifty=1,
 		/obj/item/stack/sheet/runed_metal/fifty=1,
 		)
+	//This needs to be done here and not in Initialize() because the stacks get merged and fall out when their weight updates if this is set after PopulateContents()
+	atom_storage.allow_big_nesting = TRUE
+	atom_storage.max_slots = 99
+	atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC
+	atom_storage.max_total_storage = 99
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/box/debugtools