cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional August Fixes (#5104)

Browse Source 
Fixes #5101
Fixes plants/food being able to be poured into reagent containers.
Fixes server hanging during backpressure surge.
This commit is contained in:
BurgerLUA
2018-08-07 12:09:30 -07:00
committed by Erki
parent 5453afa830
commit c31bcd2d72
7 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/reagent_containers.dm
View File

@@ -64,15 +64,16 @@
return
if(is_type_in_list(target,can_be_placed_into))
return
if(standard_splash_mob(user, target))
return
if(standard_feed_mob(user,target))
return
if(standard_splash_mob(user, target))
return
if(standard_pour_into(user, target))
return
if(standard_splash_obj(user, target))
return
/obj/item/weapon/reagent_containers/proc/reagentlist() // For attack logs
if(reagents)
return reagents.get_reagents()
@@ -106,12 +107,13 @@
reagents.splash(target, reagents.total_volume)
return
/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
// This goes into afterattack
/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target)
if(!istype(target))
return
if(user.a_intent != I_HURT)
return
return 0
if(!reagents || !reagents.total_volume)
user << "<span class='notice'>[src] is empty.</span>"
@@ -148,9 +150,13 @@
playsound(user.loc, 'sound/items/drink.ogg', rand(10, 50), 1)
/obj/item/weapon/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack
if(!istype(target))
return 0
if(user.a_intent == I_HURT)
return 0
if(!reagents || !reagents.total_volume)
user << "<span class='notice'>\The [src] is empty.</span>"
return 1

3
code/modules/reagents/reagent_containers/food.dm
View File

@@ -37,5 +37,8 @@
. = ..()
/obj/item/weapon/reagent_containers/food/standard_splash_mob(var/mob/user, var/mob/target)
return 1 //Returning 1 will cancel everything else in a long line of things it should do.
#undef CELLS
#undef CELLSIZE