Skip to content

Commit

Permalink
Secborg loadout update (#2501)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bokkiewokkie authored Aug 18, 2023
1 parent 403ef84 commit 8d8615a
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 4 deletions.
7 changes: 4 additions & 3 deletions code/modules/mob/living/silicon/robot/robot_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 38 additions & 0 deletions nsv13/code/modules/jobs/security/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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. <b>It has an effective range of 2 meters</b>"
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)"
Binary file modified nsv13/icons/obj/guns/projectile.dmi
Binary file not shown.

0 comments on commit 8d8615a

Please sign in to comment.