Add a mining(plasma) shotgun for 6,000 points with a gibtonite defuser for 1,000 (#11000)

* Add the plasma shotgun

10k points for the gun
5k for the autodefuser

* Lower Values

10,000 -> 6,000
5,000 -> 1,000

* cleanup & fix

* cleanup
This commit is contained in:
Redmoogle
2021-03-12 04:13:56 -05:00
committed by GitHub
parent e117736baf
commit 6927a8dc42
7 changed files with 70 additions and 2 deletions

View File

@@ -24,6 +24,8 @@
new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500, VENDING_WEAPON),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000, VENDING_WEAPON),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000, VENDING_WEAPON),
new /datum/data/mining_equipment("Plasma Cutter Shotgun", /obj/item/gun/energy/plasmacutter/scatter, 6000, VENDING_WEAPON),
new /datum/data/mining_equipment("Plasma Shotgun Upgrade", /obj/item/upgrade/plasmacutter/defuser, 1000, VENDING_WEAPON),
new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100, VENDING_UPGRADE),
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100, VENDING_UPGRADE),
new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150, VENDING_UPGRADE),
@@ -274,6 +276,8 @@
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 750, VENDING_WEAPON),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 1500, VENDING_WEAPON),
new /datum/data/mining_equipment("Plasma Cutter" , /obj/item/gun/energy/plasmacutter, 2500, VENDING_WEAPON),
new /datum/data/mining_equipment("Plasma Cutter Shotgun", /obj/item/gun/energy/plasmacutter/scatter, 6000, VENDING_WEAPON),
new /datum/data/mining_equipment("Plasma Shotgun Upgrade", /obj/item/upgrade/plasmacutter/defuser, 1000, VENDING_WEAPON),
new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100, VENDING_UPGRADE),
new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100, VENDING_UPGRADE),
new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150, VENDING_UPGRADE),

View File

@@ -10,6 +10,16 @@
delay = 10
e_cost = 10
/obj/item/ammo_casing/energy/plasma/scatter
projectile_type = /obj/item/projectile/plasma/scatter
delay = 15
e_cost = 70
pellets = 5
variance = 25
/obj/item/ammo_casing/energy/plasma/scatter/adv
projectile_type = /obj/item/projectile/plasma/scatter/adv
/obj/item/ammo_casing/energy/plasma/adv/cyborg
projectile_type = /obj/item/projectile/plasma/adv
delay = 10

View File

@@ -215,6 +215,21 @@
force = 15
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
/obj/item/gun/energy/plasmacutter/scatter
name = "plasma cutter shotgun"
icon_state = "miningshotgun"
item_state = "miningshotgun"
desc = "An industrial-grade heavy-duty mining shotgun"
force = 10
ammo_type = list(/obj/item/ammo_casing/energy/plasma/scatter)
/obj/item/gun/energy/plasmacutter/attackby(obj/item/I, mob/user)
. = ..()
if(try_upgrade(I))
to_chat(user, "<span class='notice'>You install [I] into [src]</span>")
playsound(loc, 'sound/items/screwdriver.ogg', 100, 1)
qdel(I)
/obj/item/gun/energy/plasmacutter/adv/cyborg
name = "cyborg advanced plasma cutter"
icon_state = "adv_plasmacutter"
@@ -222,6 +237,30 @@
selfcharge = 1
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv/cyborg)
// Upgrades for plasma cutters
/obj/item/upgrade/plasmacutter
name = "generic upgrade kit"
desc = "An upgrade for plasma shotguns."
icon = 'icons/obj/objects.dmi'
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
/obj/item/upgrade/plasmacutter/defuser
name = "plasma cutter defusal kit"
desc = "An upgrade for plasma shotguns that allows it to automatically defuse gibtonite."
/obj/item/gun/energy/plasmacutter/proc/try_upgrade(obj/item/I)
return // no upgrades for the plasmacutter
/obj/item/gun/energy/plasmacutter/scatter/try_upgrade(obj/item/I)
if(.)
return
if(istype(I, /obj/item/upgrade/plasmacutter/defuser))
var/kaboom = new/obj/item/ammo_casing/energy/plasma/scatter/adv
ammo_type = list(kaboom)
return TRUE
return FALSE
/obj/item/gun/energy/wormhole_projector
name = "bluespace wormhole projector"
desc = "A projector that emits high density quantum-coupled bluespace beams."

View File

@@ -22,11 +22,26 @@
if(range > 0)
return BULLET_ACT_FORCE_PIERCE
/obj/item/projectile/plasma/scatter/adv/on_hit(atom/target)
if(istype(target, /turf/closed/mineral/gibtonite))
var/turf/closed/mineral/gibtonite/gib = target
gib.defuse()
. = ..()
/obj/item/projectile/plasma/adv
damage = 7
range = 5
mine_range = 5
/obj/item/projectile/plasma/scatter
damage = 2
range = 5
mine_range = 2
dismemberment = 0
// Same as the scatter but with automatic defusing
/obj/item/projectile/plasma/scatter/adv
/obj/item/projectile/plasma/adv/mech
damage = 10
range = 9

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 37 KiB