From 8d8615a1d841ecb893dc778dd91aeb05dafed26f Mon Sep 17 00:00:00 2001 From: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:40:02 +0200 Subject: [PATCH] Secborg loadout update (#2501) --- .../mob/living/silicon/robot/robot_modules.dm | 7 ++-- config/game_options.txt | 2 +- nsv13/code/modules/jobs/security/weapons.dm | 38 ++++++++++++++++++ nsv13/icons/obj/guns/projectile.dmi | Bin 3375 -> 3459 bytes 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 213dee56b11..c43b93fe79a 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -440,10 +440,11 @@ /obj/item/restraints/handcuffs/cable/zipties, /obj/item/melee/baton/loaded, /obj/item/borg/charger, - /obj/item/gun/energy/disabler/cyborg, + /obj/item/gun/energy/printer/taser, + /obj/item/gun/energy/printer/glock, /obj/item/clothing/mask/gas/sechailer/cyborg, - /obj/item/extinguisher/mini) - emag_modules = list(/obj/item/gun/energy/laser/cyborg) + /obj/item/extinguisher/mini) //NSV13 replaced disabler with taser and (lethal) glock printer guns + emag_modules = list(/obj/item/gun/energy/printer) //NSV13 replaced energy gun with LMG ratvar_modules = list( /obj/item/clock_module/abscond, /obj/item/clockwork/weapon/brass_spear, diff --git a/config/game_options.txt b/config/game_options.txt index 68f4ca6d5a9..37353b430ad 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -350,7 +350,7 @@ ALLOW_AI_MULTICAM ## Secborg ### ## Uncomment to prevent the security cyborg module from being chosen -DISABLE_SECBORG +#DISABLE_SECBORG ## Peacekeeper Borg ### ## Uncomment to prevent the peacekeeper cyborg module from being chosen diff --git a/nsv13/code/modules/jobs/security/weapons.dm b/nsv13/code/modules/jobs/security/weapons.dm index 89ede1de18c..a1426c47632 100644 --- a/nsv13/code/modules/jobs/security/weapons.dm +++ b/nsv13/code/modules/jobs/security/weapons.dm @@ -234,3 +234,41 @@ M.set_heartattack(TRUE) M.reagents.add_reagent(/datum/reagent/medicine/corazone, 3) // To give the victim a final chance to shock their heart before losing consciousness . = ..() + + +//Secborg guns +/obj/item/gun/energy/printer/taser + name = "Cyborg X25 Taser" + desc = "A stunning weapon developed by Czanek Corp. It can deliver an extremely powerful electric shock via a specialised electrode, the electrodes are resupplied using the cyborg's internal power source. It has an effective range of 2 meters" + icon = 'nsv13/icons/obj/guns/projectile.dmi' + icon_state = "taser" + recoil = 2 //BZZZZTTTTTTT + ammo_type = list(/obj/item/ammo_casing/energy/taser) + automatic = FALSE + fire_rate = 0.2 + +/obj/item/ammo_casing/energy/taser + projectile_type = /obj/item/projectile/energy/electrode/hitscan + select_name = "electrode" + fire_sound = 'sound/weapons/zapbang.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect + e_cost = 600 //uses a lot more energy + +/obj/item/gun/energy/printer/glock + name = "Cyborg Glock-13BR" + desc = "An integrated 9mm handgun for use by Nanotrasen security cyborgs. Designed to fire lethal bullets" + icon = 'nsv13/icons/obj/guns/projectile.dmi' + icon_state = "secborgglock" + ammo_type = list(/obj/item/ammo_casing/energy/c9mmbullet/rubber, /obj/item/ammo_casing/energy/c9mmbullet) //Switch between lethal or rubber bullets with attack_self + automatic = FALSE + fire_rate = 2 + +/obj/item/ammo_casing/energy/c9mmbullet + projectile_type = /obj/item/projectile/bullet/c9mm + select_name = "9mm" + fire_sound = 'nsv13/sound/weapons/glock.ogg' + firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect + +/obj/item/ammo_casing/energy/c9mmbullet/rubber + projectile_type = /obj/item/projectile/bullet/c9mm/rubber + select_name = "9mm (Rubber)" diff --git a/nsv13/icons/obj/guns/projectile.dmi b/nsv13/icons/obj/guns/projectile.dmi index cc6f81f8d474c21382313d2fefc16b0b784cfa8b..ce4ac44209c9502a416604468f5882031442f2b3 100644 GIT binary patch delta 3069 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