mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 19:44:09 +01:00
Evil Cyborgs - Non-Engineer Emag/Malf Modules (#24638)
* Evil Janitor Cyborg * Evil Medical Cyborg * Little less cyanide * Evil Service Borg * Combat Cyborg Firmware Upgrade cost adjustment * Minor code fixes * Updated Energy Type * Spacing Changes * Evil Mining Borg pt1 * Sonic Jackhammer Force, Functions as Combat and Utility mining module * Moved guitar * Moved KA * Naming, Inheritance changes * Fix landmine stack icon * Landmine Repath, RSG Magazine Length and KA Overheat changes * Service Borg Shotgun - Lasershot, Ammo Cap Nerf, No more slug * REALLY got rid of compact slugs * RSG - 2u Toxin, 20 Brute heavy syringes * Syringe Gun Fire Rate * Changed syringe creation, moved syringe cannon off syringe gun * Purged syndie hypo, new emag hypo pierces armor/suits
This commit is contained in:
@@ -169,7 +169,6 @@
|
||||
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG
|
||||
muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
|
||||
|
||||
|
||||
/obj/item/ammo_casing/shotgun/buckshot
|
||||
name = "buckshot shell"
|
||||
desc = "A 12 gauge buckshot shell. Fires a spread of lethal shot."
|
||||
|
||||
@@ -117,6 +117,11 @@
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
|
||||
max_ammo = 6
|
||||
|
||||
/obj/item/ammo_box/magazine/internal/shot/malf
|
||||
name = "cyborg shotgun internal magazine"
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/lasershot
|
||||
max_ammo = 8
|
||||
|
||||
/obj/item/ammo_box/magazine/internal/shot/dual
|
||||
name = "double-barrel shotgun internal magazine"
|
||||
max_ammo = 2
|
||||
|
||||
@@ -79,6 +79,15 @@
|
||||
max_mod_capacity = 80
|
||||
icon_state = "kineticgun_b"
|
||||
|
||||
/obj/item/gun/energy/kinetic_accelerator/cyborg/malf
|
||||
name = "kinetic accelerator cannon"
|
||||
desc = "A cyborg-modified kinetic accelerator that operates in pressurized environments, but cannot be upgraded and fires slowly."
|
||||
icon_state = "kineticgun_h"
|
||||
item_state = "kineticgun_h"
|
||||
max_mod_capacity = 0
|
||||
ammo_type = list(/obj/item/ammo_casing/energy/kinetic/malf)
|
||||
overheat_time = 2 SECONDS
|
||||
|
||||
/obj/item/gun/energy/kinetic_accelerator/minebot
|
||||
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
|
||||
overheat_time = 20
|
||||
@@ -185,6 +194,9 @@
|
||||
var/obj/item/gun/energy/kinetic_accelerator/KA = loc
|
||||
KA.modify_projectile(BB)
|
||||
|
||||
//Malf casing
|
||||
/obj/item/ammo_casing/energy/kinetic/malf
|
||||
projectile_type = /obj/item/projectile/kinetic/malf
|
||||
|
||||
//Projectiles
|
||||
/obj/item/projectile/kinetic
|
||||
@@ -199,6 +211,11 @@
|
||||
var/pressure_decrease = 0.25
|
||||
var/obj/item/gun/energy/kinetic_accelerator/kinetic_gun
|
||||
|
||||
/obj/item/projectile/kinetic/malf
|
||||
pressure_decrease = 1
|
||||
color = "#FFFFFF"
|
||||
icon_state = "ka_tracer"
|
||||
|
||||
/obj/item/projectile/kinetic/pod
|
||||
range = 4
|
||||
|
||||
|
||||
@@ -320,6 +320,16 @@
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
execution_speed = 5 SECONDS
|
||||
|
||||
/// Service Malfunction Borg Combat Shotgun Variant
|
||||
/obj/item/gun/projectile/shotgun/automatic/combat/cyborg
|
||||
name = "cyborg shotgun"
|
||||
desc = "Get those organics off your station. Holds eight shots. Can only reload in a recharge station."
|
||||
mag_type = /obj/item/ammo_box/magazine/internal/shot/malf
|
||||
|
||||
/obj/item/gun/projectile/shotgun/automatic/combat/cyborg/cyborg_recharge(coeff, emagged)
|
||||
if(magazine.ammo_count() < magazine.max_ammo)
|
||||
magazine.stored_ammo.Add(new /obj/item/ammo_casing/shotgun/lasershot)
|
||||
|
||||
//Dual Feed Shotgun
|
||||
|
||||
/obj/item/gun/projectile/shotgun/automatic/dual_tube
|
||||
|
||||
@@ -413,3 +413,5 @@
|
||||
user.adjustStaminaLoss(20, FALSE)
|
||||
user.adjustOxyLoss(20)
|
||||
return ..()
|
||||
|
||||
|
||||
|
||||
@@ -256,6 +256,9 @@
|
||||
icon = 'icons/obj/chemical.dmi'
|
||||
icon_state = "syringeproj"
|
||||
|
||||
/obj/item/projectile/bullet/dart/syringe/heavyduty
|
||||
damage = 20
|
||||
|
||||
/obj/item/projectile/bullet/dart/syringe/pierce_ignore
|
||||
piercing = TRUE
|
||||
|
||||
|
||||
Reference in New Issue
Block a user