cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14544 from Heroman3003/runtime-fixes-1

Browse Source 
Fixes 2 runtimes
This commit is contained in:
Heroman3003
2023-02-25 13:01:55 +10:00
committed by CHOMPStation2
parent 18b6791abf
commit 0f1ad47460
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/food/food/z_custom_food_vr.dm
View File

@@ -55,7 +55,7 @@ var/global/ingredientLimit = 20000
if(src.addTop) if(src.addTop)
cut_overlay(topping) cut_overlay(topping)
if(!fullyCustom && !stackIngredients && our_overlays.len) if(!fullyCustom && !stackIngredients && LAZYLEN(our_overlays))
cut_overlay(filling) //we can't directly modify the overlay, so we have to remove it and then add it again cut_overlay(filling) //we can't directly modify the overlay, so we have to remove it and then add it again
var/newcolor = S.filling_color != "#FFFFFF" ? S.filling_color : AverageColor(getFlatIcon(S, S.dir, 0), 1, 1) var/newcolor = S.filling_color != "#FFFFFF" ? S.filling_color : AverageColor(getFlatIcon(S, S.dir, 0), 1, 1)
filling.color = BlendRGB(filling.color, newcolor, 1/ingredients.len) filling.color = BlendRGB(filling.color, newcolor, 1/ingredients.len)

2
code/modules/shieldgen/directional_shield.dm
View File

@@ -66,7 +66,7 @@
/obj/effect/directional_shield/bullet_act(var/obj/item/projectile/P) /obj/effect/directional_shield/bullet_act(var/obj/item/projectile/P)
adjust_health(-P.get_structure_damage()) adjust_health(-P.get_structure_damage())
P.on_hit() P.on_hit(src)
playsound(src, 'sound/effects/EMPulse.ogg', 75, 1) playsound(src, 'sound/effects/EMPulse.ogg', 75, 1)
// All the shields tied to their projector are one 'unit', and don't have individualized health values like most other shields. // All the shields tied to their projector are one 'unit', and don't have individualized health values like most other shields.