cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8735 from Spookerton/spkrtn/fix/8703-8733

Browse Source 
Spkrtn/fix/8703 8733
This commit is contained in:
Spookerton
2022-10-07 20:59:19 +01:00
committed by GitHub
parent e212411b01 d8da5055dd
commit 29546fd08f
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/hydroponics/seed.dm
View File

@@ -812,12 +812,10 @@
product = new has_item_product(get_turf(user))
else
product = new /obj/item/reagent_containers/food/snacks/grown(get_turf(user),name)
if(get_trait(TRAIT_PRODUCT_COLOUR))
if(!istype(product, /mob))
product.color = get_trait(TRAIT_PRODUCT_COLOUR)
if(istype(product,/obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/food = product
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
if (get_trait(TRAIT_PRODUCT_COLOUR))
if (istype(product,/obj/item/reagent_containers/food))
var/obj/item/reagent_containers/food/food = product
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
if(mysterious)
product.name += "?"

12
code/modules/mob/living/bot/bot.dm
View File

@@ -249,11 +249,17 @@
++frustration
return
/mob/living/bot/proc/handleFrustrated(var/targ)
obstacle = targ ? target_path[1] : patrol_path[1]
/mob/living/bot/proc/handleFrustrated(has_target)
obstacle = null
if (has_target)
if (length(target_path))
obstacle = target_path[1]
else if (length(patrol_path))
obstacle = patrol_path[1]
target_path = list()
patrol_path = list()
return
/mob/living/bot/proc/lookForTargets()
return

2
code/modules/mob/living/bot/mulebot.dm
View File

@@ -187,7 +187,7 @@
flick("mulebot-emagged", src)
update_icons()
/mob/living/bot/mulebot/handleFrustrated()
/mob/living/bot/mulebot/handleFrustrated(has_target)
custom_emote(2, "makes a sighing buzz.")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
..()