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

Merge pull request #3683 from Citadel-Station-13/upstream-merge-32143

Browse Source 
[MIRROR] Allows filling welders from open containers that have welding fuel in them
This commit is contained in:
LetterJay
2017-10-30 22:12:04 -04:00
committed by GitHub
parent df6bd6fa4c 3ed1a681c7
commit 4dbcce6885
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools.dm
+9
View File
@@ -457,6 +457,15 @@
flamethrower_screwdriver(I, user)
else if(istype(I, /obj/item/stack/rods))
flamethrower_rods(I, user)
else if(istype(I, /obj/item/reagent_containers) && is_open_container())
var/amountNeeded = max_fuel - get_fuel()
var/obj/item/reagent_containers/container = I
if(length(container.reagents.reagent_list) > 1)
to_chat(user, "<span class='warning'>[container] has too many chemicals mixed into it. You wouldn't want to put the wrong chemicals into [src].</span>")
return ..()
if(amountNeeded > 0 && container.reagents.has_reagent("welding_fuel"))
container.reagents.trans_id_to(src, "welding_fuel", amountNeeded)
to_chat(user, "<span class='notice'>You transfer some fuel from [container] to [src].</span>")
else
return ..()