Merge branch 'master220' into Abotch-Remap

ss220-space · Sep 22, 2024 · 971c742 · 971c742
2 parents 489c508 + e4c619b
commit 971c742
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 38 deletions.
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
@@ -58,16 +58,17 @@
 #define PREFTOGGLE_2_MC_TAB							(1<<11) // 2048
 #define PREFTOGGLE_2_DISABLE_TGUI_INPUT				(1<<12) // 4096
 #define PREFTOGGLE_2_PARALLAX_MULTIZ				(1<<13) // 8192
-#define PREFTOGGLE_2_DISABLE_VOTE_POPUPS			(1<<14)	// 16384
-#define PREFTOGGLE_2_SWAP_INPUT_BUTTONS				(1<<15) // 32768
-#define PREFTOGGLE_2_LARGE_INPUT_BUTTONS			(1<<16) // 65536
-#define PREFTOGGLE_2_BIG_STRIP_MENU					(1<<17) // 131072
-#define PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE		(1<<18) // 262144
-#define PREFTOGGLE_2_PIXELATED_MENU					(1<<19) // 524288
+#define PREFTOGGLE_2_DISABLE_VOTE_POPUPS                        (1<<14)        // 16384
+#define PREFTOGGLE_2_SWAP_INPUT_BUTTONS                                (1<<15) // 32768
+#define PREFTOGGLE_2_LARGE_INPUT_BUTTONS                        (1<<16) // 65536
+#define PREFTOGGLE_2_BIG_STRIP_MENU                                        (1<<17) // 131072
+#define PREFTOGGLE_2_ENABLE_TGUI_SAY_LIGHT_MODE                (1<<18) // 262144
+#define PREFTOGGLE_2_PIXELATED_MENU                                        (1<<19) // 524288
+#define PREFTOGGLE_2_DESC_TIPS			(1<<20) // 1048576
 
-#define TOGGLES_2_TOTAL								1048575 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
+#define TOGGLES_2_TOTAL								2097151 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.
 
-#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_PARALLAX_MULTIZ|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS)
+#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING|PREFTOGGLE_2_RUNECHAT|PREFTOGGLE_2_DEATHMESSAGE|PREFTOGGLE_2_SEE_ITEM_OUTLINES|PREFTOGGLE_2_PARALLAX_MULTIZ|PREFTOGGLE_2_SWAP_INPUT_BUTTONS|PREFTOGGLE_2_LARGE_INPUT_BUTTONS|PREFTOGGLE_2_DESC_TIPS)
 
 // Sanity checks
 #if TOGGLES_TOTAL > 16777215

diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
@@ -544,18 +544,16 @@ SUBSYSTEM_DEF(jobs)
 					G.upgrade_prescription()
 					H.update_nearsighted_effects()
 
-		// Wheelchair necessary?
-		var/obj/item/organ/external/l_foot = H.get_organ(BODY_ZONE_PRECISE_L_FOOT)
-		var/obj/item/organ/external/r_foot = H.get_organ(BODY_ZONE_PRECISE_R_FOOT)
-		if(!l_foot && !r_foot || (H.client.prefs.disabilities & DISABILITY_FLAG_PARAPLEGIA) && !(H.dna.species.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA))
-			var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(H.loc)
-			W.buckle_mob(H, TRUE)
+		if(!issilicon(H))
+			// Wheelchair necessary?
+			var/obj/item/organ/external/l_foot = H.get_organ(BODY_ZONE_PRECISE_L_FOOT)
+			var/obj/item/organ/external/r_foot = H.get_organ(BODY_ZONE_PRECISE_R_FOOT)
+			if(!l_foot && !r_foot || (H.client.prefs.disabilities & DISABILITY_FLAG_PARAPLEGIA) && !(H.dna.species.blacklisted_disabilities & DISABILITY_FLAG_PARAPLEGIA))
+				var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(H.loc)
+				W.buckle_mob(H, TRUE)
 	return H
 
 
-
-
-
 /datum/controller/subsystem/jobs/proc/LoadJobsFile(jobsfile, highpop) //ran during round setup, reads info from jobs.txt -- Urist
 	if(!CONFIG_GET(flag/load_jobs_from_txt))
 		return

diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
@@ -105,7 +105,7 @@
 					 list("key"=/obj/item/stack/sheet/metal,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="Peripherals control module is secured."),
-					 //7
+					//7
 					 list("key"=TOOL_SCREWDRIVER,
 					 		"backkey"=TOOL_CROWBAR,
 					 		"desc"="Peripherals control module is installed."),
@@ -122,7 +122,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //11
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //12
@@ -346,7 +346,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //17
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //18
@@ -601,7 +601,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //12
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //13
@@ -979,7 +979,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //17
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //18
@@ -1220,7 +1220,7 @@
 					 		"desc"="The bluespace crystal is engaged."),
 					 //8
 					 list("key" = TOOL_SCREWDRIVER,
-					 		"backkey"=/obj/item/wirecutters,
+					 		"backkey"=TOOL_WIRECUTTER,
 					 		"desc"="The bluespace crystal is connected."),
 					 //9
 					 list("key" = /obj/item/stack/cable_coil,
@@ -1271,7 +1271,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //21
-					 list("key" = /obj/item/wirecutters,
+					 list("key" = TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //22
@@ -1549,7 +1549,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //11
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //12
@@ -1754,7 +1754,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //11
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //12
@@ -1980,7 +1980,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //17
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //18
@@ -2255,7 +2255,7 @@
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is adjusted."),
 					 //17
-					 list("key"=/obj/item/wirecutters,
+					 list("key"=TOOL_WIRECUTTER,
 					 		"backkey"=TOOL_SCREWDRIVER,
 					 		"desc"="The wiring is added."),
 					 //18

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -1001,18 +1001,19 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
 
 /obj/item/MouseEntered(location, control, params)
 	if(item_flags & (IN_INVENTORY|IN_STORAGE))
-		var/timedelay = 8
-		var/mob/user = usr
-		tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), timedelay, TIMER_STOPPABLE)
+		var/mob/living/user = usr
+		if(user.client.prefs.toggles2 & PREFTOGGLE_2_DESC_TIPS)
+			var/timedelay = 8
+			tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), timedelay, TIMER_STOPPABLE)
+
 		if(QDELETED(src))
 			return
-		var/mob/living/L = user
 		if(!(user.client.prefs.toggles2 & PREFTOGGLE_2_SEE_ITEM_OUTLINES))
 			return
-		if(istype(L) && L.incapacitated())
-			apply_outline(L, COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now
+		if(istype(user) && user.incapacitated())
+			apply_outline(user, COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now
 		else
-			apply_outline(L) //if the player's alive and well we send the command with no color set, so it uses the theme's color
+			apply_outline(user) //if the player's alive and well we send the command with no color set, so it uses the theme's color
 
 
 /obj/item/MouseExited()

diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm
@@ -580,3 +580,13 @@
     enable_message = "You will see full-size TGUI strip menu."
     disable_message = "You will see minuature TGUI strip menu."
     blackbox_message = "Toggle TGUI strip menu size"
+
+/datum/preference_toggle/toggle_item_descritpion_tips
+    name = "Toggle item description tips"
+    description = "Toggles item description tips on hover."
+    preftoggle_bitflag = PREFTOGGLE_2_DESC_TIPS
+    preftoggle_toggle = PREFTOGGLE_TOGGLE2
+    preftoggle_category = PREFTOGGLE_CATEGORY_LIVING
+    enable_message = "You will see item description tips now."
+    disable_message = "You will not see item description tips now."
+    blackbox_message = "Toggle item description tips on hover"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -138,12 +138,12 @@
 	if(!putIn(I, user))
 		return ATTACK_CHAIN_PROCEED
 
-	addtimer(CALLBACK(src, PROC_REF(cooking_end), I, user))
+	addtimer(CALLBACK(src, PROC_REF(cooking_end), I, user), cooktime)
 	return ATTACK_CHAIN_BLOCKED_ALL
 
 
 /obj/machinery/cooker/proc/cooking_end(obj/item/cooking, mob/cook)
-	if(!QDELETED(cooking) || cooking.loc != src)
+	if(QDELETED(cooking) || cooking.loc != src)
 		return
 	//New interaction to allow special foods to be made/cooked via deepfryer without removing original functionality
 	//Define the foods/results on the specific machine		--FalseIncarnate

diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
@@ -214,7 +214,7 @@
 		owner.AdjustStunned(-2 SECONDS * boost)
 		owner.AdjustWeakened(-2 SECONDS * boost)
 		owner.SetSleeping(0)
-		owner.adjustStaminaLoss(-1 * boost)
+		owner.adjustStaminaLoss(-7 * boost)
 
 
 /obj/item/organ/internal/heart/cybernetic/upgraded/proc/message_to_owner(mob/M, message)