cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unifies wield-shotgun and wield-rifle into wield-firearm. (#6591)

Browse Source 
Title says it all.

This needed some changes to offhand (which is now a subtype of weapon, not /weapon/gun), but otherwise it seems to work well in testing.
This commit is contained in:
Matt Atlas
2019-07-21 21:53:27 +02:00
committed by Erki
parent e0240180be
commit d9fb393845
13 changed files with 108 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/custom_ka/core.dm
View File

@@ -28,8 +28,6 @@
dispersion = list(0)
reliability = 100
action_button_name = "Wield kinetic accelerator"
var/obj/item/projectile/projectile_type = /obj/item/projectile/kinetic
needspin = FALSE
@@ -44,6 +42,8 @@
wielded = 0
needspin = TRUE
is_wieldable = TRUE
var/require_wield = FALSE
var/build_name = ""
@@ -71,17 +71,6 @@
var/can_disassemble_cell = TRUE
var/can_disassemble_barrel = TRUE
/obj/item/weapon/gun/custom_ka/verb/wield_accelerator()
set name = "Wield"
set category = "Object"
set src in usr
toggle_wield(usr)
/obj/item/weapon/gun/custom_ka/ui_action_click()
if(src in usr)
toggle_wield(usr)
/obj/item/weapon/gun/custom_ka/can_wield()
return 1