cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Mining Gear Resprite [MDB IGNORE] (#8911)

Browse Source 
* Mining Gear Resprite (#62168)

* mining gear resprite

* Merge branch 'master' of https://github.com/tgstation/tgstation into laaland

* update

* oopsie woopsie

* PKA CODE SUX BALZ

* woopsie

* Mining Gear Resprite

* Update device.dm

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-23 01:18:28 +02:00
committed by GitHub
parent c419862250
commit 770a21701f
30 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
View File

@@ -2,6 +2,7 @@
name = "proto-kinetic accelerator"
desc = "A self recharging, ranged mining tool that does increased damage in low pressure."
icon_state = "kineticgun"
base_icon_state = "kineticgun"
inhand_icon_state = "kineticgun"
ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
cell_type = /obj/item/stock_parts/cell/emproof
@@ -74,6 +75,7 @@
M.modify_projectile(K)
/obj/item/gun/energy/kinetic_accelerator/cyborg
icon_state = "kineticgun_b"
holds_charge = TRUE
unique_frequency = TRUE
max_mod_capacity = 80
@@ -153,7 +155,7 @@
/obj/item/gun/energy/kinetic_accelerator/update_overlays()
. = ..()
if(!can_shoot())
. += "[icon_state]_empty"
. += "[base_icon_state]_empty"
//Casing
/obj/item/ammo_casing/energy/kinetic
@@ -565,11 +567,19 @@
. = ..()
if(.)
KA.icon_state = chassis_icon
KA.inhand_icon_state = chassis_icon
KA.name = chassis_name
if(iscarbon(KA.loc))
var/mob/living/carbon/holder = KA.loc
holder.update_inv_hands()
/obj/item/borg/upgrade/modkit/chassis_mod/uninstall(obj/item/gun/energy/kinetic_accelerator/KA)
KA.icon_state = initial(KA.icon_state)
KA.inhand_icon_state = initial(KA.inhand_icon_state)
KA.name = initial(KA.name)
if(iscarbon(KA.loc))
var/mob/living/carbon/holder = KA.loc
holder.update_inv_hands()
..()
/obj/item/borg/upgrade/modkit/chassis_mod/orange /////ICON OVERRIDE IN modular_skyrat/modules/aesthetics/guns/icons/energy.dmi

3
code/modules/projectiles/guns/energy/special.dm
View File

@@ -89,6 +89,7 @@
name = "mini energy crossbow"
desc = "A weapon favored by syndicate stealth specialists."
icon_state = "crossbow"
base_icon_state = "crossbow"
inhand_icon_state = "crossbow"
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=2000)
@@ -106,6 +107,7 @@
name = "candy corn crossbow"
desc = "A weapon favored by Syndicate trick-or-treaters."
icon_state = "crossbow_halloween"
base_icon_state = "crossbow_halloween"
inhand_icon_state = "crossbow"
ammo_type = list(/obj/item/ammo_casing/energy/bolt/halloween)
@@ -113,6 +115,7 @@
name = "energy crossbow"
desc = "A reverse engineered weapon using syndicate technology."
icon_state = "crossbowlarge"
base_icon_state = "crossbowlarge"
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/iron=4000)
suppressed = null