Merge pull request #9549 from atlantiscze/bright-solution

Refactor floodlights
This commit is contained in:
Zuhayr
2015-05-30 02:11:10 +09:30
11 changed files with 103 additions and 68 deletions
@@ -194,7 +194,7 @@
wrapped = A.cell
A.cell.add_fingerprint(user)
A.cell.updateicon()
A.cell.update_icon()
A.cell.loc = src
A.cell = null
@@ -211,7 +211,7 @@
wrapped = A.cell
A.cell.add_fingerprint(user)
A.cell.updateicon()
A.cell.update_icon()
A.updateicon()
A.cell.loc = src
A.cell = null
@@ -733,7 +733,7 @@
if(opened && !wiresexposed && (!istype(user, /mob/living/silicon)))
var/datum/robot_component/cell_component = components["power cell"]
if(cell)
cell.updateicon()
cell.update_icon()
cell.add_fingerprint(user)
user.put_in_active_hand(cell)
user << "You remove \the [cell]."
+1 -1
View File
@@ -712,7 +712,7 @@
if(cell)
user.put_in_hands(cell)
cell.add_fingerprint(user)
cell.updateicon()
cell.update_icon()
src.cell = null
user.visible_message("<span class='warning'>[user.name] removes the power cell from [src.name]!</span>",\
+2 -2
View File
@@ -8,7 +8,7 @@
/obj/item/weapon/cell/initialize()
..()
updateicon()
update_icon()
/obj/item/weapon/cell/drain_power(var/drain_check, var/surge, var/power = 0)
@@ -22,7 +22,7 @@
return use(cell_amt) / CELLRATE
/obj/item/weapon/cell/proc/updateicon()
/obj/item/weapon/cell/update_icon()
overlays.Cut()
if(charge < 0.01)
@@ -159,7 +159,7 @@
else if(cell)
cell.loc = loc
cell.add_fingerprint(user)
cell.updateicon()
cell.update_icon()
icon_state = "suspension0"
cell = null