mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-22 21:57:09 +01:00
several bugfixes (#7577)
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user