cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

allows laptops to be recharged in rechargers.

Browse Source 
Conflicts:
	code/game/machinery/recharger.dm
This commit is contained in:
DJSnapshot
2014-06-23 06:22:41 -04:00
committed by ZomgPonies
parent 2d963b8a43
commit 35506b404f
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/recharger.dm
+15 -1
View File
@@ -13,7 +13,7 @@
/obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
if(istype(user,/mob/living/silicon))
return
if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton))
if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop))
if(charging)
return
@@ -29,6 +29,11 @@
if (istype(G, /obj/item/weapon/gun/energy/gun/nuclear) || istype(G, /obj/item/weapon/gun/energy/crossbow))
user << "<span class='notice'>Your gun's recharge port was removed to make room for a miniaturized reactor.</span>"
return
if(istype(G, /obj/item/device/laptop))
var/obj/item/device/laptop/L = G
if(!L.stored_computer.battery)
user << "There's no battery in it!"
return
user.drop_item()
G.loc = src
charging = G
@@ -78,6 +83,15 @@
else
icon_state = "recharger2"
return
if(istype(charging, /obj/item/device/laptop))
var/obj/item/device/laptop/L = charging
if(L.stored_computer.battery.charge < L.stored_computer.battery.maxcharge)
L.stored_computer.battery.give(100)
icon_state = "recharger1"
use_power(250)
else
icon_state = "recharger2"
return
/obj/machinery/recharger/emp_act(severity)