cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11092 from VOREStation/Fixes/11005

Browse Source 
Fixes #11005
This commit is contained in:
Aronai Sieyes
2021-07-15 15:03:15 -04:00
committed by Chompstation Bot
parent 9989a4f437
commit 4983148996
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/machinery/cell_charger.dm
View File

@@ -73,12 +73,13 @@
charging = null charging = null
charge_state = CHARGER_EMPTY charge_state = CHARGER_EMPTY
update_icon()
if((stat & (BROKEN|NOPOWER)) || !anchored) if((stat & (BROKEN|NOPOWER)) || !anchored)
update_use_power(USE_POWER_OFF) update_use_power(USE_POWER_OFF)
else else
update_use_power(USE_POWER_IDLE) update_use_power(USE_POWER_IDLE)
update_icon()
/obj/machinery/cell_charger/examine(mob/user) /obj/machinery/cell_charger/examine(mob/user)
. = ..() . = ..()
@@ -130,16 +131,13 @@
if(charging) if(charging)
remove_item(user) remove_item(user)
user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].")
update_icon()
/obj/machinery/cell_charger/attack_ai(mob/user) /obj/machinery/cell_charger/attack_ai(mob/user)
if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Borgs can remove the cell if they are near enough if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Borgs can remove the cell if they are near enough
if(charging) if(charging)
user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") remove_item(user)
charging.loc = src.loc user.visible_message("[user] disconnects [charging] from [src].", "You disconnect [charging] from [src].")
charging.update_icon()
charging = null
update_icon()
/obj/machinery/cell_charger/emp_act(severity) /obj/machinery/cell_charger/emp_act(severity)
if(stat & (BROKEN|NOPOWER)) if(stat & (BROKEN|NOPOWER))

2
code/game/machinery/recharger.dm
View File

@@ -116,7 +116,7 @@
charging = null charging = null
update_icon() update_icon()
/obj/machinery/cell_charger/attack_ai(mob/user) /obj/machinery/recharger/attack_ai(mob/user)
if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Borgs can remove the cell if they are near enough if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Borgs can remove the cell if they are near enough
if(charging) if(charging)
user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].") user.visible_message("[user] removes [charging] from [src].", "You remove [charging] from [src].")