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

Merge pull request #34601 from KorPhaeron/bomb

Browse Source 
TTVs are too big to fit in bags
This commit is contained in:
Jordan Brown
2018-01-19 09:12:45 -06:00
committed by CitadelStationBot
parent c6f227fc18
commit 3cb5b20709
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/transfer_valve.dm
+1 -4
View File
@@ -6,6 +6,7 @@
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi' lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
desc = "Regulates the transfer of air between two tanks." desc = "Regulates the transfer of air between two tanks."
w_class = WEIGHT_CLASS_BULKY
var/obj/item/tank/tank_one var/obj/item/tank/tank_one
var/obj/item/tank/tank_two var/obj/item/tank/tank_two
var/obj/item/device/assembly/attached_device var/obj/item/device/assembly/attached_device
@@ -27,15 +28,11 @@
return return
tank_one = item tank_one = item
to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>") to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
if(item.w_class > w_class)
w_class = item.w_class
else if(!tank_two) else if(!tank_two)
if(!user.transferItemToLoc(item, src)) if(!user.transferItemToLoc(item, src))
return return
tank_two = item tank_two = item
to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>") to_chat(user, "<span class='notice'>You attach the tank to the transfer valve.</span>")
if(item.w_class > w_class)
w_class = item.w_class
update_icon() update_icon()
//TODO: Have this take an assemblyholder //TODO: Have this take an assemblyholder