I think I fixed everything it is possible to stuff a light source into.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
This commit is contained in:
Aryn
2014-03-21 09:58:54 -04:00
committed by ZomgPonies
parent b575663473
commit 072bdcde60
23 changed files with 179 additions and 158 deletions
+9 -9
View File
@@ -208,7 +208,7 @@
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B,/obj/item/weapon/reagent_containers/food))
src.beaker = B
user.drop_item()
B.loc = src
B.setloc(src)
user << "You set [B] on the machine."
nanomanager.update_uis(src) // update all UIs attached to src
icon_state = "[icon_state]2"
@@ -325,7 +325,7 @@
return
src.beaker = B
user.drop_item()
B.loc = src
B.setloc(src)
user << "You add the beaker to the machine!"
src.updateUsrDialog()
icon_state = "mixer1"
@@ -338,7 +338,7 @@
src.loaded_pill_bottle = B
user.drop_item()
B.loc = src
B.setloc(src)
user << "You add the pill bottle into the dispenser slot!"
src.updateUsrDialog()
return
@@ -354,7 +354,7 @@
if (href_list["ejectp"])
if(loaded_pill_bottle)
loaded_pill_bottle.loc = src.loc
loaded_pill_bottle.setloc(src.loc)
loaded_pill_bottle = null
else if(href_list["close"])
usr << browse(null, "window=chemmaster")
@@ -966,7 +966,7 @@
else
src.beaker = O
user.drop_item()
O.loc = src
O.setloc(src)
update_icon()
src.updateUsrDialog()
return 0
@@ -980,7 +980,7 @@
for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
O.contents -= G
G.loc = src
G.setloc(src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
user << "You fill the All-In-One grinder to the brim."
@@ -1003,7 +1003,7 @@
return 1
user.before_take_item(O)
O.loc = src
O.setloc(src)
holdingitems += O
src.updateUsrDialog()
return 0
@@ -1086,7 +1086,7 @@
return
if (!beaker)
return
beaker.loc = src.loc
beaker.setloc(src.loc)
beaker = null
update_icon()
@@ -1098,7 +1098,7 @@
return
for(var/obj/item/O in holdingitems)
O.loc = src.loc
O.setloc(src.loc)
holdingitems -= O
holdingitems = list()