Merge branch 'ParadiseSS13:master' into doors-and-windoors-(updatepath)

.github/workflows/generate_autodoc.yml

@@ -24,7 +24,7 @@ jobs:
       # Nojekyll is important to disable jeykll syntax, which can mess with files that start with underscores
 
     - name: 'Deploy Documentation'
-      uses: crazy-max/ghaction-github-pages@v3
+      uses: crazy-max/ghaction-github-pages@v4
       with:
         keep_history: false
         build_dir: dmdoc

_maps/map_files/Delta/delta.dmm

@@ -59520,6 +59520,7 @@
 /obj/machinery/status_display{
 	pixel_x = -32
 	},
+/obj/item/crutches,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
 	},
@@ -83073,6 +83074,7 @@
 	name = "Emergency NanoMed";
 	pixel_x = 28
 	},
+/obj/item/crutches,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "cmo"
@@ -90435,6 +90437,7 @@
 	name = "Emergency NanoMed";
 	pixel_x = -25
 	},
+/obj/item/crutches,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "cmo"

_maps/map_files/MetaStation/MetaStation.dmm

@@ -52105,13 +52105,16 @@
 /turf/simulated/floor/engine,
 /area/station/science/test_chamber)
 "eqS" = (
-/obj/structure/rack,
-/obj/item/storage/firstaid/o2{
-	layer = 2.8;
-	pixel_x = 3;
-	pixel_y = 5
+/obj/item/crutches{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/crutches,
+/obj/item/crutches{
+	pixel_x = 2;
+	pixel_y = -2
 	},
-/obj/item/storage/firstaid,
+/obj/structure/rack,
 /obj/machinery/camera{
 	c_tag = "Medbay Secondary Storage";
 	dir = 1
@@ -64120,6 +64123,10 @@
 	pixel_y = 5
 	},
 /obj/item/storage/firstaid/fire,
+/obj/item/storage/firstaid{
+	pixel_x = -3;
+	pixel_y = -5
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkblue"
@@ -71246,6 +71253,10 @@
 	pixel_y = 5
 	},
 /obj/item/storage/firstaid/toxin,
+/obj/item/storage/firstaid/o2{
+	pixel_x = -3;
+	pixel_y = -5
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkblue"

_maps/map_files/cerestation/cerestation.dmm

@@ -67095,6 +67095,15 @@
 	pixel_x = -3
 	},
 /obj/item/hand_labeler,
+/obj/item/crutches{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/crutches,
+/obj/item/crutches{
+	pixel_x = 2;
+	pixel_y = -2
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -96637,7 +96646,7 @@
 /area/station/maintenance/apmaint)
 "xWf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"

_maps/map_files/cyberiad/cyberiad.dmm

@@ -42234,10 +42234,16 @@
 	},
 /area/station/medical/storage/secondary)
 "ckC" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = 2
+/obj/item/crutches{
+	pixel_x = -2;
+	pixel_y = 2
 	},
+/obj/item/crutches,
+/obj/item/crutches{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/structure/rack,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "darkbluefull"
@@ -42726,10 +42732,8 @@
 	},
 /area/station/medical/storage/secondary)
 "cmr" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkred"
@@ -42762,6 +42766,9 @@
 	dir = 4
 	},
 /obj/item/hand_labeler,
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = 2
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkblue"
@@ -43073,15 +43080,11 @@
 	icon_state = "darkredfull"
 	},
 /area/station/medical/storage/secondary)
-"cnL" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "darkblue"
-	},
-/area/station/medical/storage/secondary)
 "cnM" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "darkred"
@@ -44325,13 +44328,6 @@
 	icon_state = "whiteblue"
 	},
 /area/station/medical/medbay2)
-"csa" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "darkblue"
-	},
-/area/station/medical/storage/secondary)
 "csb" = (
 /obj/structure/table,
 /obj/item/handheld_defibrillator,
@@ -77049,6 +77045,12 @@
 	icon_state = "neutralfull"
 	},
 /area/station/hallway/secondary/exit)
+"njK" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "darkblue"
+	},
+/area/station/medical/storage/secondary)
 "nln" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -133621,8 +133623,8 @@ chx
 ciU
 ckB
 clh
-cmr
 cnM
+cmr
 cph
 bNK
 cpS
@@ -133877,9 +133879,9 @@ cfQ
 cou
 bSV
 sBO
-csa
+njK
 cmq
-cnL
+njK
 ciT
 bNK
 ftM

code/game/objects/items.dm

@@ -697,7 +697,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
 						"<span class='notice'>You wash [src] using [source].</span>")
 	return 1
 
-/obj/item/proc/is_crutch() //Does an item prop up a human mob and allow them to stand if they are missing a leg/foot?
+/obj/item/proc/get_crutch_efficiency() //Does an item prop up a human mob and allow them to stand if they are missing a leg/foot?
 	return 0
 
 // Return true if you don't want regular throw handling

code/game/objects/items/weapons/batons.dm

@@ -136,8 +136,8 @@
 	item_state = "cane_nt"
 	needs_permit = FALSE
 
-/obj/item/melee/classic_baton/ntcane/is_crutch()
-	return TRUE
+/obj/item/melee/classic_baton/ntcane/get_crutch_efficiency()
+	return 2
 
 /**
   * # Telescopic Baton

code/game/objects/items/weapons/cards_ids.dm

@@ -109,7 +109,10 @@
 	desc = "A card used to provide ID and determine access across the station."
 	icon_state = "id"
 	item_state = "card-id"
-	var/mining_points = 0 //For redeeming at mining equipment lockers
+	/// For redeeming at mining equipment lockers
+	var/mining_points = 0
+	/// Total mining points for the Shift.
+	var/total_mining_points = 0
 	var/list/access = list()
 	var/registered_name = "Unknown" // The name registered_name on the card
 	slot_flags = SLOT_ID
@@ -174,7 +177,7 @@
 	user.visible_message("[user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]",\
 		"You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]")
 	if(mining_points)
-		to_chat(user, "There's [mining_points] mining equipment redemption points loaded onto this card.")
+		to_chat(user, "There's <b>[mining_points] Mining Points</b> loaded onto this card. This card has earned <b>[total_mining_points] Mining Points</b> this Shift!")
 	src.add_fingerprint(user)
 	return
 
@@ -330,6 +333,7 @@
 	data["account"] = associated_account_number
 	data["owner"] = registered_name
 	data["mining"] = mining_points
+	data["total_mining"] = total_mining_points
 	return data
 
 /obj/item/card/id/deserialize(list/data)
@@ -343,6 +347,7 @@
 	associated_account_number = data["account"]
 	registered_name = data["owner"]
 	mining_points = data["mining"]
+	total_mining_points = data["total_mining"]
 	// We'd need to use icon serialization(b64) to save the photo, and I don't feel like i
 	UpdateName()
 	RebuildHTML()

code/game/objects/items/weapons/misc_items.dm

@@ -4,6 +4,7 @@
 /*CURRENT CONTENTS
 	Ball Toy
 	Cane
+	Crutches
 	Cardboard Tube
 	Fan
 	Gaming Kit
@@ -33,8 +34,35 @@
 	materials = list(MAT_METAL=50)
 	attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled")
 
-/obj/item/cane/is_crutch()
-	return 1
+/obj/item/cane/get_crutch_efficiency()
+	return 2
+
+/obj/item/crutches
+	name = "crutches"
+	desc = "A medical device to help those who have injured or missing legs to walk."
+	gender = PLURAL
+	icon = 'icons/obj/surgery.dmi' // I mean like... cmon its basically medical.dmi
+	icon_state = "crutches0"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	flags = CONDUCT
+	force = 5
+	throwforce = 7
+	w_class = WEIGHT_CLASS_BULKY
+	materials = list(MAT_METAL = 500)
+	attack_verb = list("bludgeoned", "whacked", "cracked")
+
+/obj/item/crutches/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/two_handed, force_unwielded = 5, force_wielded = 5, icon_wielded = "crutches1")
+
+/obj/item/crutches/update_icon_state()  //Currently only here to fuck with the on-mob icons.
+	icon_state = "crutches0"
+	return ..()
+
+/obj/item/crutches/get_crutch_efficiency()
+	// 6 when wielded, 2 when not. Basically a small upgrade to just having 2 canes in each hand
+	return 2 + (4 * HAS_TRAIT(src, TRAIT_WIELDED)) // less efficient when you're holding both in a single hand
 
 /obj/item/c_tube
 	name = "cardboard tube"

code/game/objects/items/weapons/twohanded.dm

@@ -719,6 +719,7 @@
 	sprite_sheets_inhand = list("Vox" = 'icons/mob/clothing/species/vox/held.dmi', "Drask" = 'icons/mob/clothing/species/drask/held.dmi')
 	toolspeed = 0.5
 	var/lifetime = 60 SECONDS
+	var/next_spark_time
 
 /obj/item/pyro_claws/Initialize(mapload)
 	. = ..()
@@ -743,8 +744,9 @@
 /obj/item/pyro_claws/afterattack(atom/target, mob/user, proximity)
 	if(!proximity)
 		return
-	if(prob(60))
+	if(prob(60) && world.time > next_spark_time)
 		do_sparks(rand(1,6), 1, loc)
+		next_spark_time = world.time + 0.8 SECONDS
 	if(istype(target, /obj/machinery/door/airlock))
 		var/obj/machinery/door/airlock/A = target
 
@@ -774,6 +776,7 @@
 	actions_types = list(/datum/action/item_action/toggle)
 	var/on_cooldown = FALSE
 	var/obj/item/assembly/signaler/anomaly/pyro/core
+	var/next_spark_time
 
 /obj/item/clothing/gloves/color/black/pyro_claws/Destroy()
 	QDEL_NULL(core)
@@ -796,7 +799,6 @@
 		return
 	if(on_cooldown)
 		to_chat(user, "<span class='notice'>[src] is on cooldown!</span>")
-		do_sparks(rand(1,6), 1, loc)
 		return
 	if(!user.drop_l_hand() || !user.drop_r_hand())
 		to_chat(user, "<span class='notice'>[src] are unable to deploy the blades with the items in your hands!</span>")
@@ -807,7 +809,9 @@
 	on_cooldown = TRUE
 	flags |= NODROP
 	addtimer(CALLBACK(src, PROC_REF(reboot)), 2 MINUTES)
-	do_sparks(rand(1,6), 1, loc)
+	if(world.time > next_spark_time)
+		do_sparks(rand(1,6), 1, loc)
+		next_spark_time = world.time + 0.8 SECONDS
 
 /obj/item/clothing/gloves/color/black/pyro_claws/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/assembly/signaler/anomaly/pyro))

code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm

@@ -21,7 +21,6 @@
 	new /obj/item/reagent_containers/glass/bottle/charcoal(src)
 	new /obj/item/reagent_containers/glass/bottle/charcoal(src)
 
-
 /obj/structure/closet/secure_closet/medical2
 	name = "anesthetic locker"
 	desc = "Used to knock people out."

code/modules/client/preference/link_processing.dm

@@ -959,7 +959,7 @@
 						var/list/actualview = getviewsize(parent.view)
 						parent.void.UpdateGreed(actualview[1],actualview[2])
 
-					parent.debug_text_overlay.update_view(parent)
+					parent.debug_text_overlay?.update_view(parent)
 
 				if("afk_watch")
 					if(!(toggles2 & PREFTOGGLE_2_AFKWATCH))

code/modules/mining/machine_redemption.dm

@@ -252,7 +252,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 
 	// General info
-	data["id"] = inserted_id ? list("name" = "[inserted_id.registered_name] ([inserted_id.assignment])", "points" = inserted_id.mining_points) : null
+	data["id"] = inserted_id ? list("name" = "[inserted_id.registered_name] ([inserted_id.assignment])", "points" = inserted_id.mining_points, "total_points" = inserted_id.total_mining_points) : null
 	data["points"] = points
 	data["disk"] = inserted_disk ? list(
 		"name" = inserted_disk.name,
@@ -300,7 +300,8 @@
 				return
 			if(anyone_claim || (req_access_claim in inserted_id.access))
 				inserted_id.mining_points += points
-				to_chat(usr, "<span class='notice'>[points] points claimed.</span>")
+				inserted_id.total_mining_points += points
+				to_chat(usr, "<span class='notice'><b>[points] Mining Points</b> claimed. You have earned a total of <b>[inserted_id.total_mining_points] Mining Points</b> this Shift!</span>")
 				points = 0
 			else
 				to_chat(usr, "<span class='warning'>Required access not found.</span>")