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

Commit 301152f

Browse files
authored
i wonder if this works first try (#22714)
1 parent 9e77461 commit 301152f

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

code/modules/mining/equipment/upgrades.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,21 @@
110110
for(var/obj/item/borg/upgrade/modkit/kit in gun.modkits)
111111
kit.uninstall(gun)
112112
qdel(gun)
113-
var/obj/item/gun/energy/kinetic_accelerator/mega/newgun = new(get_turf(user))
113+
var/obj/item/gun/energy/kinetic_accelerator/mega/glacite/newgun = new(get_turf(user))
114114
user.put_in_hand(newgun)
115115
to_chat(user,"Harsh tendrils wrap around the kinetic accelerator, merging the parts and kinetic accelerator to form a mega kinetic accelerator.")
116116
qdel(src)
117117
if(/obj/item/gun/energy/plasmacutter/adv)
118118
var/obj/item/gun/energy/plasmacutter/adv/gun = target
119119
qdel(gun)
120-
var/obj/item/gun/energy/plasmacutter/adv/mega/newgun = new(get_turf(user))
120+
var/obj/item/gun/energy/plasmacutter/adv/mega/glacite/newgun = new(get_turf(user))
121121
user.put_in_hand(newgun)
122122
to_chat(user,"Harsh tendrils wrap around the plasma cutter, merging the parts and cutter to form a mega plasma cutter.")
123123
qdel(src)
124124
if(/obj/item/gun/energy/plasmacutter/scatter)
125125
var/obj/item/gun/energy/plasmacutter/scatter/gun = target
126126
qdel(gun)
127-
var/obj/item/gun/energy/plasmacutter/scatter/mega/newgun = new(get_turf(user))
127+
var/obj/item/gun/energy/plasmacutter/scatter/mega/glacite/newgun = new(get_turf(user))
128128
user.put_in_hand(newgun)
129129
to_chat(user,"Harsh tendrils wrap around the plasma cutter shotgun, merging the parts and cutter to form a mega plasma cutter shotgun.")
130130
qdel(src)

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,12 @@
166166
desc = "A self recharging, ranged mining tool that does increased damage in low pressure. This one has been enhanced with plasma magmite."
167167
max_mod_capacity = 120
168168

169+
/obj/item/gun/energy/kinetic_accelerator/mega/glacite
170+
name = "mega proto-kinetic accelerator"
171+
icon_state = "kineticgun_g"
172+
item_state = "kineticgun_glacite"
173+
desc = "A self recharging, ranged mining tool that does increased damage in low pressure. This one has been enhanced with plasma glacite."
174+
169175
//Casing
170176
/obj/item/ammo_casing/energy/kinetic
171177
projectile_type = /obj/projectile/kinetic

code/modules/projectiles/guns/energy/special.dm

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,12 @@
280280
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv/mega)
281281
mod_capacity = 120
282282

283+
/obj/item/gun/energy/plasmacutter/adv/mega/glacite
284+
name = "mega plasma cutter"
285+
icon_state = "adv_plasmacutter_g"
286+
item_state = "plasmacutter_glacite"
287+
desc = "A mining tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off xenos! Or, you know, mine stuff. This one has been enhanced with plasma glacite."
288+
283289
/obj/item/gun/energy/plasmacutter/scatter
284290
name = "plasma cutter shotgun"
285291
icon_state = "miningshotgun"
@@ -297,6 +303,11 @@
297303
ammo_type = list(/obj/item/ammo_casing/energy/plasma/scatter/adv/mega)
298304
mod_capacity = 120
299305

306+
/obj/item/gun/energy/plasmacutter/scatter/mega/glacite
307+
name = "mega plasma cutter shotgun"
308+
icon_state = "miningshotgun_glacite"
309+
item_state = "miningshotgun_glacite"
310+
300311
/obj/item/gun/energy/plasmacutter/adv/cyborg
301312
name = "cyborg advanced plasma cutter"
302313
icon_state = "adv_plasmacutter"
6.97 KB
Binary file not shown.
5.74 KB
Binary file not shown.

icons/obj/guns/energy.dmi

938 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)