From 0b20baa4ef0a40e878f69fa2c0401115a61ca013 Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:24:59 -0700 Subject: [PATCH 1/7] species --- code/controllers/subsystem/characters/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/characters/species.dm b/code/controllers/subsystem/characters/species.dm index 20afd6e3bc1f..d9fcb3b90b19 100644 --- a/code/controllers/subsystem/characters/species.dm +++ b/code/controllers/subsystem/characters/species.dm @@ -48,7 +48,7 @@ tim_sort(species_lookup, /proc/cmp_auto_compare, TRUE) tim_sort(species_names, /proc/cmp_auto_compare, TRUE) - tim_sort(species_lookup, /proc/cmp_auto_compare, TRUE) + tim_sort(species_paths, /proc/cmp_auto_compare, TRUE) tim_sort(playable_species, /proc/cmp_auto_compare) tim_sort(custom_species_bases, /proc/cmp_auto_compare) From 6110a66dd90b95732fa4b1eb2bede8b6ac8ab6ae Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:33:31 -0700 Subject: [PATCH 2/7] species --- code/game/machinery/computer/atmos_alert.dm | 5 ++++- code/game/machinery/computer/station_alert.dm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 921e28aebaae..153bf06d024a 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -13,7 +13,7 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/Initialize(mapload) . = ..() - atmosphere_alarm.register_alarm(src, /atom/proc/update_icon) + atmosphere_alarm.register_alarm(src, PROC_REF(on_alarm_update)) /obj/machinery/computer/atmos_alert/Destroy() atmosphere_alarm.unregister_alarm(src) @@ -55,6 +55,9 @@ var/global/list/minor_air_alarms = list() icon_screen = initial(icon_screen) ..() +/obj/machinery/computer/atmos_alert/proc/on_alarm_update() + update_icon() + /obj/machinery/computer/atmos_alert/ui_act(action, params) if(..()) return TRUE diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 18dda5c9048b..35b4b3187a4e 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -19,7 +19,7 @@ /obj/machinery/computer/station_alert/Initialize(mapload) alarm_monitor = new monitor_type(src) - alarm_monitor.register_alarm(src, /atom/proc/update_icon) + alarm_monitor.register_alarm(src, PROC_REF(on_alarm_update)) . = ..() /obj/machinery/computer/station_alert/Destroy() @@ -52,3 +52,6 @@ else icon_screen = initial(icon_screen) ..() + +/obj/machinery/computer/station_alert/proc/on_alarm_update() + update_icon() From 2df02f3e3c8041bf8fa62ea5cf69d7d2349ff4f8 Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:38:18 -0700 Subject: [PATCH 3/7] examine --- .../atmospherics/machinery/components/binary_devices/valve.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 9f86c14af63e..3412cd5b5762 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -321,5 +321,5 @@ deconstruct() /obj/machinery/atmospherics/valve/examine(mob/user, dist) - ..() + . = ..() . += "It is [open ? "open" : "closed"]." From bf75e70c93c2fb9c0ba9637481f882320e75b7bb Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:38:43 -0700 Subject: [PATCH 4/7] cardmod --- code/modules/tgui/modules/general/cardmod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/tgui/modules/general/cardmod.dm b/code/modules/tgui/modules/general/cardmod.dm index 1d60a3a4952f..ce39ff711cdf 100644 --- a/code/modules/tgui/modules/general/cardmod.dm +++ b/code/modules/tgui/modules/general/cardmod.dm @@ -198,7 +198,7 @@ .["card_rank"] = editing?.rank .["card_assignment"] = editing?.assignment .["granted"] = editing?.access - .["can_demote"] = auth_demote(user, editing, authing, editing.rank) + .["can_demote"] = auth_demote(user, editing, authing, editing?.rank) /datum/tgui_module/card_mod/ui_act(action, list/params, datum/tgui/ui) . = ..() From 86d48d0efdfb6ba678b660fedc7c1fd0b3dcab6b Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:40:08 -0700 Subject: [PATCH 5/7] overlay --- code/modules/clothing/clothing_accessories.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 79e750ab844b..005b5c64a91e 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -100,7 +100,7 @@ if(istype(src, /obj/item/clothing/accessory)) var/obj/item/clothing/accessory/A = src old = A.get_mob_overlay() - if(old.plane == FLOAT_PLANE) + if(!isnull(old) && old.plane == FLOAT_PLANE) old.layer = layer_used + BODY_LAYER + 0.1 return old var/list/mutable_appearance/rendered = render_mob_appearance(M, accessory_render_specific? resolve_inventory_slot_meta(/datum/inventory_slot_meta/abstract/use_one_for_accessory) : slot_meta, bodytype) From 1441fbbad0b92ce39d2f581d29f88336448a3e1f Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:42:30 -0700 Subject: [PATCH 6/7] throwing --- code/game/atoms/movable/throwing.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/atoms/movable/throwing.dm b/code/game/atoms/movable/throwing.dm index 963e8936f8d6..1bc820832f4f 100644 --- a/code/game/atoms/movable/throwing.dm +++ b/code/game/atoms/movable/throwing.dm @@ -113,6 +113,9 @@ if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_THROW, target, range, speed, flags, thrower, on_hit, on_land, FALSE) & COMPONENT_CANCEL_PRE_THROW) return FALSE + if(!isnull(throwing)) + QDEL_NULL(throwing) + var/datum/thrownthing/TT = _init_throw_datum(target, range, speed, flags, thrower, on_hit, on_land, force) if(!TT) return FALSE @@ -144,6 +147,9 @@ SHOULD_CALL_PARENT(TRUE) RETURN_TYPE(/datum/thrownthing) + if(!isnull(throwing)) + QDEL_NULL(throwing) + if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_THROW, target, range, speed, flags, thrower, on_hit, on_land, TRUE) & COMPONENT_CANCEL_PRE_THROW) return FALSE @@ -162,7 +168,7 @@ return TRUE /atom/movable/proc/_init_throw_datum(atom/target, range, speed, flags, atom/thrower, datum/callback/on_hit, datum/callback/on_land, force, emulated) - if(throwing) + if(!isnull(throwing)) CRASH("already throwing") var/calculated_speed = isnull(speed)? ((movable_flags & MOVABLE_NO_THROW_SPEED_SCALING)? (throw_speed) : (throw_speed * (force > throw_resist? (force / throw_resist) ** (throw_speed_scaling_exponential * 0.1) : 1 / (throw_resist / force) ** (throw_speed_scaling_exponential * 0.1)))) : speed if(!calculated_speed) From 4dbcd2071dca9ec6a946324042ea488c5e2ad137 Mon Sep 17 00:00:00 2001 From: silicons Date: Sat, 24 Jun 2023 17:44:11 -0700 Subject: [PATCH 7/7] verbs --- code/modules/clothing/clothing_accessories.dm | 2 +- code/modules/clothing/suits/eventclothing.dm | 2 +- code/modules/clothing/under/accessories/holster.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 005b5c64a91e..783372887a7c 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -247,7 +247,7 @@ if(A) remove_accessory(usr,A) if(!LAZYLEN(accessories)) - remove_verb(src, /obj/item/clothing/proc/removetie_verb) + remove_obj_verb(src, /obj/item/clothing/proc/removetie_verb) accessories = null /obj/item/clothing/emp_act(severity) diff --git a/code/modules/clothing/suits/eventclothing.dm b/code/modules/clothing/suits/eventclothing.dm index b6242e372570..d14c6c51b44d 100644 --- a/code/modules/clothing/suits/eventclothing.dm +++ b/code/modules/clothing/suits/eventclothing.dm @@ -107,5 +107,5 @@ if(A) //If a selection is made, call the other proc hide_accessory(usr,A) if(!LAZYLEN(accessories)) //But if there are no accessories, list will be empty, meaning we ought to remove access to verb - remove_verb(src, /obj/item/clothing/under/event_reward/foxmiko/verb/hidetie) //Removes access to verb + remove_obj_verb(src, /obj/item/clothing/under/event_reward/foxmiko/verb/hidetie) //Removes access to verb accessories = null diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index f60e34344609..5e9c472cca67 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -94,7 +94,7 @@ /obj/item/clothing/accessory/holster/on_removed(mob/user as mob) if(accessory_host) - remove_verb(accessory_host, /obj/item/clothing/accessory/holster/verb/holster_verb) + remove_obj_verb(accessory_host, /obj/item/clothing/accessory/holster/verb/holster_verb) ..() //For the holster hotkey