cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 20:16:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
This commit is contained in:
PsiOmegaDelta
2015-10-16 11:04:43 +02:00
parent 3fd172ee63 af13c0d529
commit fc4c1d6af7
21 changed files with 209 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/dispenser/dispenser2.dm
+3 -8
View File
@@ -113,9 +113,6 @@
return ..()
/obj/machinery/chemical_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1)
if(stat & (BROKEN|NOPOWER)) return
if(user.stat || user.restrained()) return
// this is the data which will be sent to the ui
var/data[0]
data["amount"] = amount
@@ -148,8 +145,8 @@
ui.open()
/obj/machinery/chemical_dispenser/Topic(href, href_list)
if(stat & (NOPOWER|BROKEN))
return 0 // don't update UIs attached to this object
if(..())
return 1
if(href_list["amount"])
amount = round(text2num(href_list["amount"]), 1) // round to nearest 1
@@ -171,9 +168,7 @@
return 1 // update UIs attached to this object
/obj/machinery/chemical_dispenser/attack_ai(mob/user as mob)
src.attack_hand(user)
ui_interact(user)
/obj/machinery/chemical_dispenser/attack_hand(mob/user as mob)
if(stat & BROKEN)
return
ui_interact(user)