cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Personal shields can now remain active while put back in the belt (#19832)

Browse Source 
Personal shields can now remain active while put back in the belt,
freeing your hands.
Some code reordering and cleanup.
Fixed a runtime on inspection of the personal shield.
This commit is contained in:
Fluffy
2024-09-09 16:31:04 +00:00
committed by GitHub
parent 427b83a3c3
commit c416803f2e
2 changed files with 99 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/personal_shield.dm
+39 -19
View File
@@ -17,39 +17,65 @@
. = ..()
if(is_adjacent)
. += SPAN_NOTICE("\The [src] has [cell.charge] charge remaining.")
. += SPAN_NOTICE("Shield upkeep costs [upkeep_cost] charge, and blocking a shot costs [SPAN_NOTICE(charge_per_shot)] charge.")
. += SPAN_NOTICE("Shield upkeep costs [upkeep_cost] charge, and blocking a shot costs [SPAN_NOTICE("[charge_per_shot]")] charge.")
/obj/item/device/personal_shield/Initialize()
. = ..()
cell = new(src)
cell.charge = cell.maxcharge //1000 charge
START_PROCESSING(SSprocessing, src)
/obj/item/device/personal_shield/Destroy()
dissipate()
STOP_PROCESSING(SSprocessing, src)
QDEL_NULL(cell)
return ..()
/obj/item/device/personal_shield/get_cell()
return cell
/obj/item/device/personal_shield/process()
/obj/item/device/personal_shield/process(seconds_per_tick)
if(shield)
cell.use(upkeep_cost)
if(!ismob(src.loc))
deactivate()
return
cell.use(upkeep_cost*seconds_per_tick)
/obj/item/device/personal_shield/attack_self(mob/living/user)
if(cell.charge && !shield)
activate(user)
else
deactivate(user)
/**
* Activates the shield
*
* * user - The user that activated the shield
*/
/obj/item/device/personal_shield/proc/activate(mob/living/user)
if(cell.charge && !shield)
shield = new /obj/aura/personal_shield/device(user)
shield.added_to(user)
shield.set_shield(src)
user.update_inv_belt()
else
dissipate()
user.update_inv_belt()
START_PROCESSING(SSprocessing, src)
update_icon()
/obj/item/device/personal_shield/Move()
dissipate()
return ..()
/**
* Deactivates the shield
*
* * user - The user that deactivated the shield, if any
*/
/obj/item/device/personal_shield/proc/deactivate(mob/living/user)
if(shield)
dissipate()
user?.update_inv_belt()
/obj/item/device/personal_shield/forceMove()
dissipate()
return ..()
STOP_PROCESSING(SSprocessing, src)
update_icon()
/obj/item/device/personal_shield/proc/take_charge()
cell.use(charge_per_shot)
@@ -67,12 +93,6 @@
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
/obj/item/device/personal_shield/Destroy()
dissipate()
STOP_PROCESSING(SSprocessing, src)
QDEL_NULL(cell)
return ..()
/obj/item/device/personal_shield/proc/dissipate()
if(shield?.user)
to_chat(shield.user, FONT_LARGE(SPAN_WARNING("\The [src] fades around you, dissipating.")))