mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 15:39:57 +01:00
Bugfix Collection (#11371)
This commit is contained in:
@@ -148,12 +148,13 @@
|
||||
var/turf/T = loc
|
||||
var/footsound
|
||||
var/top_layer = 0
|
||||
for(var/obj/structure/S in T)
|
||||
if(S.layer > top_layer && S.footstep_sound)
|
||||
top_layer = S.layer
|
||||
footsound = S.footstep_sound
|
||||
if(!footsound)
|
||||
footsound = T.footstep_sound
|
||||
if(istype(T))
|
||||
for(var/obj/structure/S in T)
|
||||
if(S.layer > top_layer && S.footstep_sound)
|
||||
top_layer = S.layer
|
||||
footsound = S.footstep_sound
|
||||
if(!footsound)
|
||||
footsound = T.footstep_sound
|
||||
|
||||
if (client)
|
||||
var/turf/B = GetAbove(T)
|
||||
|
||||
@@ -35,8 +35,8 @@ calculate text size per text.
|
||||
var/decl/reagent/R = decls_repository.get_decl(_R)
|
||||
if(!R.taste_mult)
|
||||
continue
|
||||
if(R.type == /decl/reagent/nutriment)
|
||||
var/list/taste_data = REAGENT_DATA(src, R.type)
|
||||
if(_R == /decl/reagent/nutriment)
|
||||
var/list/taste_data = REAGENT_DATA(src, _R)
|
||||
for(var/taste in taste_data)
|
||||
if(taste in tastes)
|
||||
tastes[taste] += taste_data[taste]
|
||||
@@ -44,7 +44,7 @@ calculate text size per text.
|
||||
tastes[taste] = taste_data[taste]
|
||||
else
|
||||
var/taste_desc = R.taste_description
|
||||
var/taste_amount = REAGENT_VOLUME(src, R.type) * R.taste_mult
|
||||
var/taste_amount = REAGENT_VOLUME(src, _R) * R.taste_mult
|
||||
if(R.taste_description in tastes)
|
||||
tastes[taste_desc] += taste_amount
|
||||
else
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
if(length(message) >= 2 && is_language_prefix(prefix))
|
||||
var/language_prefix = lowertext(copytext(message, 2, 4))
|
||||
var/datum/language/L = language_keys[language_prefix]
|
||||
if(!L)
|
||||
if(!L || !can_speak(L))
|
||||
language_prefix = lowertext(copytext(message, 2, 3))
|
||||
L = language_keys[language_prefix]
|
||||
if(can_speak(L))
|
||||
|
||||
Reference in New Issue
Block a user