shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4673 from Citadel-Station-13/upstream-merge-34077

Browse Source 
[MIRROR] Fix incorrect method variable description in throw_impact
This commit is contained in:
deathride58
2018-01-05 22:13:19 +00:00
committed by GitHub
parent cb02d46646 c897658fb8
commit e0ff75a870
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/food_and_drinks/drinks/drinks.dm
View File

@@ -100,10 +100,10 @@
to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
..()
/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, mob/thrower)
/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, datum/thrownthing/throwinfo)
. = ..()
if(!.) //if the bottle wasn't caught
smash(target, thrower, TRUE)
smash(target, throwinfo.thrower, TRUE)
/obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
if(!isGlass)

2
code/modules/food_and_drinks/drinks/drinks/bottle.dm
View File

@@ -367,7 +367,7 @@
isGlass = FALSE
return
/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,datum/thrownthing/throwdata)
var/firestarter = 0
for(var/datum/reagent/R in reagents.reagent_list)
for(var/A in accelerants)