Skip to content

Commit

Permalink
what i said above but i acctually commited it
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 10, 2024
1 parent 5494c03 commit a82cb1c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/gun/energy/attack_hand(mob/user)
if(!internal_cell && loc == user && user.is_holding(src) && cell && tac_reloads)
if(!internal_magazine && loc == user && user.is_holding(src) && cell && tac_reloads)
eject_cell(user)
return
return ..()
Expand All @@ -126,7 +126,7 @@
update_appearance()

/obj/item/gun/energy/attackby(obj/item/A, mob/user, params)
if (!internal_cell && (A.type in allowed_ammo_types))
if (!internal_magazine && (A.type in allowed_ammo_types))
var/obj/item/stock_parts/cell/gun/C = A
if (!cell)
insert_cell(user, C)
Expand Down Expand Up @@ -169,7 +169,7 @@
update_appearance()

/obj/item/gun/energy/screwdriver_act(mob/living/user, obj/item/I)
if(cell && !internal_cell)
if(cell && !internal_magazine)
to_chat(user, span_notice("You begin unscrewing and pulling out the cell..."))
if(I.use_tool(src, user, unscrewing_time, volume = 100))
to_chat(user, span_notice("You remove the power cell."))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/energy_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
item_state = "nucgun"
charge_delay = 5
can_charge = FALSE
internal_cell = TRUE
internal_magazine = TRUE
ammo_x_offset = 2
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
obj_flags = UNIQUE_RENAME
weapon_weight = WEAPON_LIGHT
automatic_charge_overlays = FALSE
internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
custom_price = 750
w_class = WEIGHT_CLASS_BULKY

Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/energy/pulse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
internal_cell = TRUE //prevents you from giving it an OP cell - WS Edit
internal_magazine = TRUE //prevents you from giving it an OP cell - WS Edit
default_ammo_type = /obj/item/stock_parts/cell/pulse
allowed_ammo_types = list(
/obj/item/stock_parts/cell/pulse,
Expand Down Expand Up @@ -41,7 +41,7 @@
slot_flags = ITEM_SLOT_BACK
icon_state = "pulse_carbine"
item_state = null
internal_cell = FALSE
internal_magazine = FALSE
default_ammo_type = /obj/item/stock_parts/cell/gun/large
allowed_ammo_types = list(
/obj/item/stock_parts/cell/gun/large,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
tool_behaviour = TOOL_DECONSTRUCT
wall_decon_damage = 200
toolspeed = 0.9 //plasmacutters can be used like angle grinders, and are a bit faster
internal_cell = TRUE //so you don't cheese through the need for plasma - WS EDIT
internal_magazine = TRUE //so you don't cheese through the need for plasma - WS EDIT
var/charge_cut = 100 //amount of charge used up to start action (multiplied by amount) and per progress_flash_divisor ticks of cutting
var/adv = FALSE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/misc/beam_rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/beam_rifle/hitscan)
internal_cell = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
internal_magazine = FALSE //prevents you from giving it an OP cell - WS Edit //shut up dumb nerd
default_ammo_type = /obj/item/stock_parts/cell/gun/large
allowed_ammo_types = list(
/obj/item/stock_parts/cell/gun/large,
Expand Down

0 comments on commit a82cb1c

Please sign in to comment.