Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Beam rifles only get one shot #13099

Closed
Sniblet wants to merge 6 commits into from
Closed

Beam rifles only get one shot #13099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb32fa6
Update cell.dm
Sniblet Jan 14, 2022
4194e0c
Update beam_rifle.dm
Sniblet Jan 14, 2022
da23216
Delete beam_rifle.dm
Sniblet Jan 14, 2022
293b322
Delete beam_rifle.dm
Sniblet Jan 14, 2022
3989196
Update cell.dm
Sniblet Jan 14, 2022
0a7560c
Merge pull request #1 from Sniblet/Sniblet-patch-1
Sniblet Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions code/datums/actions/beam_rifle.dm
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions code/modules/power/cell.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,21 +337,6 @@
/obj/item/stock_parts/cell/emproof/corrupt()
return

/obj/item/stock_parts/cell/beam_rifle
name = "beam rifle capacitor"
desc = "A high powered capacitor that can provide huge amounts of energy in an instant."
maxcharge = 50000
chargerate = 5000 //Extremely energy intensive

/obj/item/stock_parts/cell/beam_rifle/corrupt()
return

/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
charge = clamp((charge-(10000/severity)),0,maxcharge)

/obj/item/stock_parts/cell/emergency_light
name = "miniature power cell"
desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage."
Expand All @@ -376,4 +361,4 @@
rating = 5

/obj/item/stock_parts/cell/crystal_cell/give(amount)
return //no cheating
return //no cheating
Loading