Merge branch 'dev-sierra' into pr/870

SierraBay · Oct 26, 2023 · 3e55a12 · 3e55a12
2 parents ac5ffa3 + 59898aa
commit 3e55a12
Show file tree

Hide file tree

Showing 34 changed files with 393 additions and 363 deletions.
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
@@ -57,26 +57,6 @@
 /datum/uplink_item/item/badassery/random_one/can_buy(obj/item/device/uplink/U)
 	return U.uses
 
-/datum/uplink_item/item/badassery/random_many
-	name = "Random Items"
-	desc = "Buys you as many random items as you can afford. Convenient packaging NOT included!"
-
-/datum/uplink_item/item/badassery/random_many/cost(telecrystals, obj/item/device/uplink/U)
-	return max(1, telecrystals)
-
-/datum/uplink_item/item/badassery/random_many/get_goods(obj/item/device/uplink/U, loc)
-	var/list/bought_items = list()
-	for(var/datum/uplink_item/UI in get_random_uplink_items(U, U.uses, loc))
-		UI.purchase_log(U)
-		var/obj/item/I = UI.get_goods(U, loc)
-		if(istype(I))
-			bought_items += I
-
-	return bought_items
-
-/datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U)
-	log_and_message_admins("used \the [U.loc] to buy \a [src]")
-
 /****************
 * Surplus Crate *
 ****************/

diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
@@ -41,6 +41,7 @@
 	visible_message(SPAN_WARNING("\The [src] breaks!"))
 
 /obj/machinery/computer/on_update_icon()
+	update_glow()
 	ClearOverlays()
 	icon = initial(icon)
 	icon_state = initial(icon_state)
@@ -62,7 +63,6 @@
 
 
 	if(reason_broken & MACHINE_BROKEN_NO_PARTS)
-		set_light(0)
 		icon = 'icons/obj/machines/computer.dmi'
 		icon_state = "wired"
 		var/screen = get_component_of_type(/obj/item/stock_parts/console_screen)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
@@ -251,6 +251,8 @@
 		var/datum/unarmed_attack/attack = assailant.get_unarmed_attack(src)
 		if (!attack)
 			return ..()
+		assailant.do_attack_animation(src)
+		assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		var/damage = attack.damage + rand(1,5)
 		var/attack_verb = "[pick(attack.attack_verb)]"
 
@@ -268,11 +270,8 @@
 				SPAN_WARNING("\The [assailant] [attack_verb] \the [src]!"),
 				SPAN_WARNING("You [attack_verb] \the [src]!")
 				)
-		assailant.do_attack_animation(src)
-		assailant.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		damage_health(damage, attack.get_damage_type(), attack.damage_flags())
 		return
-
 	..()
 
 /obj/is_fluid_pushable(amt)

diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
@@ -157,7 +157,8 @@
 
 	if(opened)
 		open_interact(user)
-	closed_interact(user)
+	else
+		closed_interact(user)
 
 /obj/item/device/electronic_assembly/proc/closed_interact(mob/user)
 	var/HTML = list()
@@ -210,12 +211,12 @@
 		for(var/i = start_index to min(length(assembly_components), start_index + (components_per_page - 1)))
 			var/obj/item/integrated_circuit/circuit = assembly_components[i]
 			HTML += "\[ <a href='?src=\ref[src];component=\ref[circuit];set_slot=1'>[i]</a> \] | "
-			HTML += "<a href='?src=\ref[circuit];component=\ref[circuit];rename=1'>\[R\]</a> | "
+			HTML += "<a href='?src=\ref[src];component=\ref[circuit];rename_component=1'>\[R\]</a> | "
 			if(circuit.removable)
 				HTML += "<a href='?src=\ref[src];component=\ref[circuit];remove=1'>\[-\]</a> | "
 			else
 				HTML += "\[-\] | "
-			HTML += "<a href='?src=\ref[circuit];examine=1'>[circuit.displayed_name]</a>"
+			HTML += "<a href='?src=\ref[src];component=\ref[circuit];examine_component=1'>[circuit.displayed_name]</a>"
 			HTML += "<br>"
 
 		if(length(assembly_components) > components_per_page)
@@ -275,17 +276,22 @@
 			if(href_list["remove"])
 				try_remove_component(component, usr)
 
-			else
-				// Adjust the position
-				if(href_list["set_slot"])
-					var/selected_slot = input("Select a new slot", "Select slot", current_pos) as null|num
-					if(!check_interactivity(usr))
-						return 0
-					if(selected_slot < 1 || selected_slot > length(assembly_components))
-						return 0
-
-					assembly_components.Remove(component)
-					assembly_components.Insert(selected_slot, component)
+			else if (href_list["rename_component"])
+				component.rename_component()
+
+			else if(href_list["set_slot"])
+				var/selected_slot = input("Select a new slot", "Select slot", current_pos) as null|num
+				if(!check_interactivity(usr))
+					return 0
+				if(selected_slot < 1 || selected_slot > length(assembly_components))
+					return 0
+
+				assembly_components.Remove(component)
+				assembly_components.Insert(selected_slot, component)
+
+			else if (href_list["examine_component"])
+				component.interact(usr)
+				return
 
 
 	interact(usr) // To refresh the UI.

diff --git a/code/modules/organs/internal/heart.dm b/code/modules/organs/internal/heart.dm
@@ -178,8 +178,6 @@
 				SPAN_DANGER("Blood sprays out from \the [owner]'s [spray_organ]!"),
 				FONT_HUGE(SPAN_DANGER("Blood sprays out from your [spray_organ]!"))
 			)
-			owner.set_confused(1)
-			owner.eye_blurry = 2
 
 			//AB occurs every heartbeat, this only throttles the visible effect
 			next_blood_squirt = world.time + 80

diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
@@ -355,21 +355,21 @@ GLOBAL_LIST_EMPTY(diversion_junctions)
 
 	// flush handle
 	if(flush)
-		AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-handle"))
+		AddOverlays(image(icon, "dispover-handle"))
 
 	// only handle is shown if no power
 	if(!is_powered() || mode == -1)
 		return
 
 	// 	check for items/vomit in disposal - occupied light
 	if(length(contents) > LAZYLEN(component_parts) || reagents.total_volume)
-		AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-full"))
+		AddOverlays(image(icon, "dispover-full"))
 
 	// charging and ready light
 	if(mode == 1)
-		AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-charge"))
+		AddOverlays(image(icon, "dispover-charge"))
 	else if(mode == 2)
-		AddOverlays(image('icons/obj/pipes/disposal.dmi', "dispover-ready"))
+		AddOverlays(image(icon, "dispover-ready"))
 
 // timed process
 // charge the gas reservoir and perform flush if ready

diff --git a/html/changelogs/AutoChangeLog-sierra-pr-1171.yml b/html/changelogs/AutoChangeLog-sierra-pr-1171.yml
@@ -0,0 +1,5 @@
+author: SierraKomodo
+changes:
+  - {balance: Arterial bleeds no longer cause confusion or blurred vision when they
+      trigger.}
+delete-after: true
diff --git a/maps/away/mining/mining.dm b/maps/away/mining/mining.dm
@@ -101,9 +101,9 @@
 	return res
 
 /datum/map_template/ruin/away_site/mining_signal
-	name = "Mining - Planetoid"
+	name = "Mining - Dwarf Planet"
 	id = "awaysite_mining_signal"
-	description = "A mineral-rich, formerly-volcanic site on a planetoid."
+	description = "A mineral-rich, formerly-volcanic site on a dwarf planet."
 	suffixes = list("mining/mining-signal.dmm")
 	spawn_cost = 1
 	generate_mining_by_z = 1

diff --git a/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm b/maps/random_ruins/exoplanet_ruins/marooned/marooned.dm
@@ -59,7 +59,7 @@
 /obj/item/paper/marooned/note03
 	info = "Day 4. Saw some animals outside. Look pretty ferocious, and probably not edible. I'll stick to MREs for now.<br>I guess I'll start with how I ended up here. We were on a special mission far away from Magnitka, checking something for the Academy of Sciences, anomalous readings of some sort. The professor looked pretty excited, but I didn't really understand the technical details. We got few scientists embedded in our crew, a civilian hull paintjob and 'alternative' transponder codes. Business as usual."
 /obj/item/paper/marooned/note04
-	info = "Day 5.<br>We got to the destination without much trouble. A planetoid, in an uncharted sector of space. Scientists locked down the readings they were looking for, and we sent a team down. They returned with some sort of obelisk, etched with symbols I've never seen before, maybe 3 meters tall. Should've ditched that thing out of airlock there and then."
+	info = "Day 5.<br>We got to the destination without much trouble. A dwarf planet, in an uncharted sector of space. Scientists locked down the readings they were looking for, and we sent a team down. They returned with some sort of obelisk, etched with symbols I've never seen before, maybe 3 meters tall. Should've ditched that thing out of airlock there and then."
 /obj/item/paper/marooned/note05
 	info = "Day 8. Made a running wave antenna and jury rigged some amplification for the radio. Hope someone will hear the signal.<br>That obelisk was trouble. People on guard duty in cargo hold kept complaining about headaches and hearing things. Some didn't. They were nice enough to offer to take the shifts of those who complained. Now that I think about it, that's when they started acting weird."
 /obj/item/paper/marooned/note06

diff --git a/maps/sierra/sierra_ranks.dm b/maps/sierra/sierra_ranks.dm
@@ -13,7 +13,6 @@
 		/datum/mil_branch/skrell_fleet,
 		/datum/mil_branch/iccgn,
 		/datum/mil_branch/css,
-		/datum/mil_branch/pioneer,
 		/datum/mil_branch/fleet,
 		/datum/mil_branch/scga
 	)
@@ -26,7 +25,6 @@
 		/datum/mil_branch/skrell_fleet,
 		/datum/mil_branch/iccgn,
 		/datum/mil_branch/css,
-		/datum/mil_branch/pioneer,
 		/datum/mil_branch/fleet,
 		/datum/mil_branch/scga
 	)

diff --git a/maps/torch/torch5_deck1.dmm b/maps/torch/torch5_deck1.dmm
@@ -17200,12 +17200,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
-"fDm" = (
-/obj/structure/sign/science_1{
-	dir = 1
-	},
-/turf/simulated/wall/prepainted,
-/area/rnd/entry)
 "fDJ" = (
 /obj/floor_decal/corner/blue{
 	dir = 5
@@ -52255,7 +52249,7 @@ pzZ
 axw
 iTC
 rvY
-fDm
+aBP
 lkb
 nLb
 nLb

diff --git a/maps/torch/torch_define.dm b/maps/torch/torch_define.dm
@@ -32,7 +32,7 @@
 		"SFP Territory Support",
 		"SFP Special Investigations",
 		"SFP Fugitive Recovery",
-		"Sol Fleet Mars Commmand",
+		"Sol Fleet Mars Command",
 		"Bureau of Diplomatic Affairs",
 		"Emergency Management Bureau",
 		"Secure Routing Service"

diff --git a/mods/_maps/farfleet/code/farfleet.dm b/mods/_maps/farfleet/code/farfleet.dm
@@ -42,8 +42,9 @@
 	description = "Garibaldi-class Gunboat, ICCG Pioneer Corps Reconnaissance Craft."
 	prefix = "mods/_maps/farfleet/maps/"
 	suffixes = list("farfleet-1.dmm", "farfleet-2.dmm")
-	spawn_cost = 50 // Temporary disabled
-	player_cost = 50
+	ban_ruins = list(/datum/map_template/ruin/away_site/patrol)
+	spawn_cost = 0.5
+	player_cost = 7
 	spawn_weight = 1
 	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/snz)