several bugfixes (#7577)

This commit is contained in:
Timothy Teakettle
2026-05-15 19:31:46 +02:00
committed by GitHub
parent edbe9fbf5f
commit 0e3eef37c8
11 changed files with 27 additions and 16 deletions
+1
View File
@@ -143,6 +143,7 @@
/datum/prototype/design/proc/ui_data_list()
return list(
"name" = name,
"truncated_name" = length(name) <= 18 ? name : copytext(name, 1, 19) + "..",
"desc" = desc,
"id" = id,
"work" = work,
+2 -2
View File
@@ -2,7 +2,7 @@
name = "\improper PDA multicaster"
desc = "This machine mirrors messages sent to it to specific departments."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "controller"
icon_state = "pdamulti"
density = 1
anchored = 1
circuit = /obj/item/circuitboard/telecomms/pda_multicaster
@@ -33,7 +33,7 @@
if(on)
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)]-p"
icon_state = "[initial(icon_state)]_off"
return ..()
/obj/machinery/pda_multicaster/attackby(obj/item/I, mob/user)
@@ -11,9 +11,14 @@
//materials_base = list("metal" = 50, MAT_GLASS = 50)
/obj/item/binoculars/attack_self(mob/user, datum/event_args/actor/actor)
. = ..()
if(.)
return
zoom()
// the zoom proc needs taking out back but this fixes binoculars being janky for now
/obj/item/binoculars/unequipped(mob/user, slot, flags)
. = ..()
if(zoom)
zoom()
@@ -44,7 +44,8 @@
/obj/item/clothing/under/rank/nursesuit,
/obj/item/clothing/head/nursehat,
/obj/item/gps/medical,
/obj/item/storage/box/freezer = 3)
/obj/item/storage/box/freezer = 3,
/obj/item/clothing/glasses/hud/health)
/obj/structure/closet/secure_closet/medical3/Initialize(mapload)
if(prob(50))
+3 -6
View File
@@ -1756,13 +1756,10 @@
if(modifiers && modifiers.len)
for(var/datum/modifier/mod in modifiers)
if(isnull(modifier_set) && !isnull(mod.pulse_set_level))
if(isnull(mod.pulse_set_level))
continue
if(isnull(modifier_set) || mod.pulse_set_level > modifier_set)
modifier_set = round(mod.pulse_set_level) // Should be a whole number, but let's not take chances.
else if(mod.pulse_set_level > modifier_set)
modifier_set = round(mod.pulse_set_level)
modifier_set = max(0, modifier_set) // No setting to negatives.
if(mod.pulse_modifier)
modifier_shift += mod.pulse_modifier
+3
View File
@@ -94,6 +94,9 @@
if(incapacitated())
to_chat(src, "<span class='warning'>You are physically unable to climb \the [ladder].</span>")
return FALSE
if(is_buckled())
to_chat(src, "<spab class='warning'>You can't do this while buckled to \the [buckled]!</span>")
return FALSE
return TRUE
/mob/observer/ghost/may_climb_ladders(var/ladder)
@@ -1,5 +1,6 @@
/datum/chemical_reaction/paint
abstract_type = /datum/chemical_reaction/paint
has_data_semantics = TRUE
var/result_color
/datum/chemical_reaction/paint/compute_result_data_initializer(datum/reagent_holder/holder, multiplier)
@@ -46,9 +46,9 @@
var/total_volume = old_volume + new_volume
var/old_hex = uppertext(old_data || "#ffffff")
var/new_hex = uppertext(new_data || "#ffffff")
return rgb(
((hex2num(copytext(old_hex, 2, 4)) * old_volume) + (hex2num(copytext(new_hex, 2, 4)))) / total_volume,
((hex2num(copytext(old_hex, 4, 6)) * old_volume) + (hex2num(copytext(new_hex, 4, 6)))) / total_volume,
((hex2num(copytext(old_hex, 6, 8)) * old_volume) + (hex2num(copytext(new_hex, 6, 8)))) / total_volume,
((hex2num(length(old_hex) > 7 ? copytext(old_hex, 8, 10) : 255) * old_volume) + (hex2num(length(new_hex) > 7 ? copytext(new_hex, 8, 10) : 255))) / total_volume,
((hex2num(copytext(old_hex, 6, 8)) * old_volume) + (hex2num(copytext(new_hex, 6, 8)))) / total_volume
)
@@ -163,8 +163,10 @@
// hotfix: they're synthetic without synthetic parts, oops!
/datum/species/shapeshifter/holosphere/get_blood_colour(mob/living/carbon/human/H)
if(H)
return blood_color
return blood_color
/datum/species/shapeshifter/holosphere/get_blood_name(mob/living/carbon/human/H)
return "coolant"
/datum/species/shapeshifter/holosphere/get_valid_shapeshifter_forms()
return list(