Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactors ebows and kpa's to the same parent #11939

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+221 −189
Open

Refactors ebows and kpa's to the same parent #11939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af39535
recharging energy weps
Tsar-Salat Nov 24, 2024
f3a6164
that too
Tsar-Salat Nov 24, 2024
00dbc27
oops
Tsar-Salat Nov 24, 2024
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
2 changes: 1 addition & 1 deletion _maps/RuinGeneration/17x17_charliecrew.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion _maps/shuttles/hunter/hunter_bounty.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions beestation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,6 +3623,7 @@
#include "code\modules\projectiles\guns\energy\laser_gatling.dm"
#include "code\modules\projectiles\guns\energy\mounted.dm"
#include "code\modules\projectiles\guns\energy\pulse.dm"
#include "code\modules\projectiles\guns\energy\recharge.dm"
#include "code\modules\projectiles\guns\energy\special.dm"
#include "code\modules\projectiles\guns\energy\stun.dm"
#include "code\modules\projectiles\guns\magic\staff.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
/obj/item/skeleton_key,
/obj/item/discovery_scanner,
/obj/item/gun/energy/e_gun/mini/exploration,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/gun/energy/recharge/kinetic_accelerator,
/obj/item/gun/energy/plasmacutter,
/obj/item/grenade/exploration,
/obj/item/exploration_detonator,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/uplink_kits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
new /obj/item/chameleon(src) // 7 tc

if("stealth")
new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
new /obj/item/gun/energy/recharge/ebow(src)
new /obj/item/pen/sleepy(src)
new /obj/item/healthanalyzer/rad_laser(src)
new /obj/item/chameleon(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/role_preference/role_antagonists.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
gloves = /obj/item/clothing/gloves/combat
mask = /obj/item/clothing/mask/gas
l_hand = /obj/item/melee/transforming/energy/sword
r_hand = /obj/item/gun/energy/kinetic_accelerator/crossbow
r_hand = /obj/item/gun/energy/recharge/ebow

/datum/outfit/traitor/post_equip(mob/living/carbon/human/H, visualsOnly)
var/obj/item/melee/transforming/energy/sword/sword = locate() in H.held_items
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
qdel(briefcase_item)
for(var/i = 3 to 0 step -1)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/stack/spacecash/c1000, null, TRUE, TRUE)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/gun/energy/kinetic_accelerator/crossbow, null, TRUE, TRUE)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/gun/energy/recharge/ebow, null, TRUE, TRUE)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/gun/ballistic/revolver/mateba, null, TRUE, TRUE)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/ammo_box/a357, null, TRUE, TRUE)
SEND_SIGNAL(sec_briefcase, COMSIG_TRY_STORAGE_INSERT, new /obj/item/grenade/plastic/x4, null, TRUE, TRUE)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/spacesuits/hardsuit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
heat_protection = HEAD
armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 15, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 75, STAMINA = 40, BLEED = 70)
light_range = 7
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator)
high_pressure_multiplier = 0.6

/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize(mapload)
Expand Down Expand Up @@ -386,7 +386,7 @@
heat_protection = HEAD
armor = list(MELEE = 35, BULLET = 15, LASER = 20, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 75, STAMINA = 20, BLEED = 70)
light_range = 6
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator)
actions_types = list(
/datum/action/item_action/toggle_helmet_light,
/datum/action/item_action/toggle_beacon_hud/explorer
Expand Down Expand Up @@ -888,7 +888,7 @@
icon_state = "hardsuit0-ancient"
item_state = "anc_helm"
armor = list(MELEE = 30, BULLET = 5, LASER = 5, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 75, STAMINA = 30, BLEED = 70)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/gun/energy/plasmacutter, /obj/item/gun/energy/plasmacutter/adv, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro/old, /obj/item/gun/energy/e_gun/old)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/gun/energy/plasmacutter, /obj/item/gun/energy/plasmacutter/adv, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro/old, /obj/item/gun/energy/e_gun/old)
hardsuit_type = "ancient"
resistance_flags = FIRE_PROOF

Expand All @@ -898,7 +898,7 @@
icon_state = "hardsuit-ancient"
item_state = "anc_hardsuit"
armor = list(MELEE = 30, BULLET = 5, LASER = 5, ENERGY = 10, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 75, STAMINA = 30, BLEED = 70)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro/old, /obj/item/gun/energy/e_gun/old)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage/bag/ore, /obj/item/pickaxe, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/gun/energy/laser/retro, /obj/item/gun/energy/laser/retro/old, /obj/item/gun/energy/e_gun/old)
slowdown = 3
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient
resistance_flags = FIRE_PROOF
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/cloaks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
name = "drake armour"
icon_state = "dragon"
desc = "A suit of armour fashioned from the remains of an ash drake."
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/spear)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/pickaxe, /obj/item/spear)
armor = list(MELEE = 70, BULLET = 30, LASER = 50, ENERGY = 40, BOMB = 70, BIO = 60, RAD = 50, FIRE = 100, ACID = 100, STAMINA = 30, BLEED = 50)
hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/wintercoats.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
/obj/item/resonator,
/obj/item/mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/gun/energy/recharge/kinetic_accelerator,
/obj/item/reagent_containers/cup/glass/bottle,
/obj/item/flashlight,
/obj/item/tank/internals/emergency_oxygen,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/shaft_miner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
duffelbag = /obj/item/storage/backpack/duffelbag
box = /obj/item/storage/box/survival/mining

chameleon_extras = /obj/item/gun/energy/kinetic_accelerator
chameleon_extras = /obj/item/gun/energy/recharge/kinetic_accelerator

/datum/outfit/job/miner/equipped
name = "Shaft Miner (Equipment)"
Expand All @@ -66,7 +66,7 @@
/obj/item/knife/combat/survival=1,
/obj/item/mining_voucher=1,
/obj/item/t_scanner/adv_mining_scanner/lesser=1,
/obj/item/gun/energy/kinetic_accelerator=1,\
/obj/item/gun/energy/recharge/kinetic_accelerator=1,\
/obj/item/stack/marker_beacon/ten=1)

/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mining/equipment/explorer_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/obj/item/resonator,
/obj/item/mining_scanner,
/obj/item/t_scanner/adv_mining_scanner,
/obj/item/gun/energy/kinetic_accelerator,
/obj/item/gun/energy/recharge/kinetic_accelerator,
/obj/item/pickaxe
)
resistance_flags = FIRE_PROOF
Expand Down Expand Up @@ -84,7 +84,7 @@
resistance_flags = FIRE_PROOF | LAVA_PROOF
slowdown = 0
armor = list(MELEE = 70, BULLET = 40, LASER = 20, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 100, FIRE = 100, ACID = 100, STAMINA = 40, BLEED = 50)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/pickaxe)
high_pressure_multiplier = 0.6

/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/machine_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
icon_deny = "mining-deny"
prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
//Direct mining tools go here
new /datum/data/vendor_equipment("Proto-Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 500),
new /datum/data/vendor_equipment("Proto-Kinetic Accelerator", /obj/item/gun/energy/recharge/kinetic_accelerator, 500),
new /datum/data/vendor_equipment("Proto-Kinetic Crusher", /obj/item/kinetic_crusher, 800),
new /datum/data/vendor_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
new /datum/data/vendor_equipment("Plasma Cutter", /obj/item/gun/energy/plasmacutter, 2000),
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/mine_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
new /obj/item/storage/bag/plants(src)
new /obj/item/storage/bag/ore(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
new /obj/item/gun/energy/kinetic_accelerator(src)
new /obj/item/gun/energy/recharge/kinetic_accelerator(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/survivalcapsule(src)
new /obj/item/assault_pod/mining(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mining/minebot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
var/mode = MODE_MINING /// What mode the minebot is in
var/mining_enabled = FALSE /// Whether or not the minebot will mine new ores while in mining mode.
var/list/installed_upgrades /// A list of all the minebot's installed upgrades
var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_pka /// The minebot's stored PKA
var/obj/item/gun/energy/recharge/kinetic_accelerator/minebot/stored_pka /// The minebot's stored PKA
var/obj/item/gun/energy/plasmacutter/stored_cutter /// The minebot's stored plasma cutter
var/obj/item/pickaxe/drill/stored_drill /// The minebot's stored drill
var/obj/item/t_scanner/adv_mining_scanner/stored_scanner /// The minebot's stored mining scanner
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/robot_modules.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
/obj/item/weldingtool/cyborg/mini,
/obj/item/extinguisher/mini,
/obj/item/storage/bag/sheetsnatcher/borg,
/obj/item/gun/energy/kinetic_accelerator/cyborg,
/obj/item/gun/energy/recharge/kinetic_accelerator/cyborg,
/obj/item/gps/cyborg,
/obj/item/stack/marker_beacon)
emag_modules = list(/obj/item/borg/stun)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
return loc != user ? TRUE : FALSE

/obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user as mob|obj)
balloon_alert(user, "[src] clicks.")
balloon_alert_to_viewers("*click*")
playsound(src, dry_fire_sound, 30, TRUE)

/obj/item/gun/proc/fire_sounds()
Expand Down
Loading
Loading