mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 12:29:23 +01:00
Replaces security disruptors with ballistics and removes all disruptors (#21987)
Security officers and the warden each get a .45 pistol loaded with rubbers, and a spare rubber mag in their lockers. The investigator get a new .45 revolver loaded with rubbers, based on the konyang revolver, and a speedloader, also with rubbers. The armory has had .45 speedloaders added to it, but is otherwise untouched. Also the autolathe gets to print .45 speedloaders now for the investigator gun. Practice ammo has been added to the autolathe. The Elyran ERT had their disruptors replaced with plasma pistols. Other non-Horizon disruptors were replaced with lethal .45. Horizon disruptors were replaced with rubber .45.
This commit is contained in:
Casper3667
@@ -3408,7 +3408,6 @@
|
||||
#include "code\modules\projectiles\guns\energy\blaster.dm"
|
||||
#include "code\modules\projectiles\guns\energy\crank.dm"
|
||||
#include "code\modules\projectiles\guns\energy\cult.dm"
|
||||
#include "code\modules\projectiles\guns\energy\disruptor.dm"
|
||||
#include "code\modules\projectiles\guns\energy\freezeray.dm"
|
||||
#include "code\modules\projectiles\guns\energy\laser.dm"
|
||||
#include "code\modules\projectiles\guns\energy\lawgiver.dm"
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
belt = /obj/item/storage/belt/medical/paramedic/combat
|
||||
back = /obj/item/storage/backpack/satchel/med
|
||||
accessory = /obj/item/clothing/accessory/holster/thigh
|
||||
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
|
||||
accessory_contents = list(/obj/item/gun/projectile/plasma/bolter/pistol = 1)
|
||||
r_ear = /obj/item/flashlight/pen
|
||||
l_pocket = /obj/item/healthanalyzer
|
||||
r_pocket = /obj/item/melee/telebaton
|
||||
@@ -112,7 +112,8 @@
|
||||
/obj/item/clothing/accessory/storage/pouches/black = 1,
|
||||
/obj/item/reagent_containers/glass/bottle/thetamycin = 1,
|
||||
/obj/item/surgery/scalpel/manager = 1,
|
||||
/obj/item/tank/emergency_oxygen/double = 1
|
||||
/obj/item/tank/emergency_oxygen/double = 1,
|
||||
/obj/item/ammo_magazine/plasma/light/pistol = 2
|
||||
)
|
||||
|
||||
belt_contents = list(
|
||||
@@ -140,7 +141,7 @@
|
||||
back = /obj/item/storage/backpack/messenger/med
|
||||
belt = /obj/item/storage/belt/medical/paramedic/combat
|
||||
accessory = /obj/item/clothing/accessory/holster/thigh
|
||||
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
|
||||
accessory_contents = list(/obj/item/gun/projectile/plasma/bolter/pistol = 1)
|
||||
l_pocket = /obj/item/healthanalyzer
|
||||
r_pocket = /obj/item/crowbar
|
||||
l_hand = /obj/item/storage/firstaid/adv
|
||||
@@ -151,7 +152,8 @@
|
||||
/obj/item/storage/firstaid/combat = 1,
|
||||
/obj/item/clothing/accessory/storage/pouches/black = 1,
|
||||
/obj/item/reagent_containers/glass/bottle/thetamycin = 1,
|
||||
/obj/item/storage/pill_bottle/mortaphenyl = 1
|
||||
/obj/item/storage/pill_bottle/mortaphenyl = 1,
|
||||
/obj/item/ammo_magazine/plasma/light/pistol = 2
|
||||
)
|
||||
|
||||
belt_contents = list(
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
belt = list(
|
||||
/obj/item/storage/belt/security/full,
|
||||
/obj/item/storage/belt/security/full/alt,
|
||||
/obj/item/storage/belt/security/full/disruptor,
|
||||
/obj/item/storage/belt/security/full/pistol45,
|
||||
)
|
||||
glasses = list(
|
||||
|
||||
@@ -53,7 +53,8 @@
|
||||
/obj/item/storage/box/survival/engineer = 1,
|
||||
/obj/item/clothing/head/helmet/swat/peacekeeper = 1,
|
||||
/obj/item/clothing/accessory/holster/hip = 1,
|
||||
/obj/item/gun/energy/disruptorpistol/magnum = 1
|
||||
/obj/item/gun/projectile/sec/wood/lethal = 1,
|
||||
/obj/item/ammo_magazine/c45m = 2
|
||||
)
|
||||
|
||||
implants = list(
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
accessory_contents = list(
|
||||
/obj/item/gun/projectile/sec = 1
|
||||
)
|
||||
belt = /obj/item/storage/belt/security/full/disruptor
|
||||
belt = /obj/item/storage/belt/security/full/pistol45
|
||||
|
||||
|
||||
/datum/job/eventmed
|
||||
|
||||
@@ -339,7 +339,6 @@
|
||||
/obj/item/crowbar,
|
||||
/obj/item/gun/projectile/sec,
|
||||
/obj/item/gun/energy/repeater/pistol,
|
||||
/obj/item/gun/energy/disruptorpistol,
|
||||
/obj/item/taperoll/police,
|
||||
/obj/item/material/knife/trench,
|
||||
/obj/item/shield/energy,
|
||||
@@ -373,16 +372,6 @@
|
||||
/obj/item/gun/energy/taser = 1,
|
||||
)
|
||||
|
||||
/obj/item/storage/belt/security/full/disruptor
|
||||
starts_with = list(
|
||||
/obj/item/melee/baton/loaded = 1,
|
||||
/obj/item/reagent_containers/spray/pepper = 1,
|
||||
/obj/item/handcuffs = 2,
|
||||
/obj/item/flash = 1,
|
||||
/obj/item/gun/energy/disruptorpistol = 1,
|
||||
/obj/item/flashlight/flare = 1,
|
||||
)
|
||||
|
||||
/obj/item/storage/belt/security/full/pistol45
|
||||
starts_with = list(
|
||||
/obj/item/melee/baton/loaded = 1,
|
||||
|
||||
@@ -181,7 +181,6 @@
|
||||
/obj/item/gun/projectile/automatic/terminator = 0.1,
|
||||
/obj/item/personal_shield = 0.4,
|
||||
/obj/random/safe_rig = 0.4,
|
||||
/obj/item/gun/energy/disruptorpistol/magnum = 0.3,
|
||||
/obj/item/gun/projectile/shotgun/pump/combat = 0.2,
|
||||
/obj/item/clothing/glasses/thermal = 0.5
|
||||
)
|
||||
@@ -238,7 +237,6 @@
|
||||
/obj/item/clothing/glasses/thermal = 0.3,
|
||||
/obj/item/storage/toolbox/infiltration = 0.3,
|
||||
/obj/random/melee/highvalue = 0.3,
|
||||
/obj/item/gun/energy/disruptorpistol/magnum = 0.3,
|
||||
/obj/item/gun/projectile/shotgun/pump/combat = 0.2,
|
||||
/obj/item/gun/energy/acp = 0.1,
|
||||
/obj/item/gun/projectile/automatic/terminator = 0.1,
|
||||
|
||||
@@ -138,7 +138,6 @@
|
||||
/obj/item/gun/projectile/revolver/lemat,
|
||||
/obj/item/gun/projectile/tanto,
|
||||
/obj/item/gun/projectile/automatic/x9,
|
||||
/obj/item/gun/energy/disruptorpistol,
|
||||
/obj/item/gun/energy/retro,
|
||||
/obj/item/gun/projectile/revolver/konyang/pirate
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
new /obj/item/flash(src)
|
||||
new /obj/item/taperoll/engineering(src)
|
||||
new /obj/item/rfd/piping(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
new /obj/item/gps/engineering(src)
|
||||
new /obj/item/pipewrench(src)
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
/obj/structure/closet/secure_closet/guncabinet/station/lessthanlethals/fill()
|
||||
for(var/i = 1 to 15)
|
||||
new /obj/item/ammo_magazine/c45m/rubber(src)
|
||||
for(var/i = 1 to 4)
|
||||
new /obj/item/ammo_magazine/c45/revolver/rubber(src)
|
||||
for(var/i = 1 to 8)
|
||||
new /obj/item/ammo_magazine/mc9mmt/rubber(src)
|
||||
for(var/i = 1 to 4)
|
||||
@@ -75,6 +77,8 @@
|
||||
/obj/structure/closet/secure_closet/guncabinet/station/lethals/fill()
|
||||
for(var/i = 1 to 8)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
for(var/i = 1 to 4)
|
||||
new /obj/item/ammo_magazine/c45/revolver(src)
|
||||
for(var/i = 1 to 6)
|
||||
new /obj/item/ammo_magazine/mc9mmt(src)
|
||||
new /obj/item/ammo_magazine/a556/carbine/polymer(src)
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
new /obj/item/clothing/accessory/stethoscope(src)
|
||||
new /obj/item/storage/box/fancy/keypouch/med(src)
|
||||
new /obj/item/advanced_healthanalyzer(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
new /obj/item/eftpos(src)
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
new /obj/item/orbital_dropper/drill(src)
|
||||
new /obj/item/megaphone/cargo(src)
|
||||
new /obj/item/storage/stickersheet/goldstar(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
new /obj/item/storage/belt/utility/full(src)
|
||||
new /obj/item/multitool(src)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
new /obj/item/paicard(src)
|
||||
new /obj/item/storage/box/tethers(src)
|
||||
new /obj/item/taperoll/science(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
new /obj/item/storage/box/unique/freezer/organcooler/psireceiver(src)
|
||||
new /obj/item/megaphone/sci(src)
|
||||
|
||||
@@ -201,7 +201,8 @@
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/gun/energy/disruptorpistol(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/ammo_magazine/c45m/rubber(src)
|
||||
new /obj/item/breath_analyzer(src)
|
||||
//Belts
|
||||
new /obj/item/clothing/accessory/storage/black_vest(src)
|
||||
@@ -269,7 +270,8 @@
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/security(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/ammo_magazine/c45m/rubber(src)
|
||||
new /obj/item/taperoll/police(src)
|
||||
new /obj/item/hailer(src)
|
||||
new /obj/item/flashlight/flare/glowstick/red(src)
|
||||
@@ -300,7 +302,8 @@
|
||||
new /obj/item/radio/headset/headset_sec(src)
|
||||
new /obj/item/radio/headset/headset_sec/alt(src)
|
||||
new /obj/item/clothing/suit/armor/carrier/officer(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature/security(src)
|
||||
new /obj/item/gun/projectile/revolver/security(src)
|
||||
new /obj/item/ammo_magazine/c45/revolver/rubber(src)
|
||||
new /obj/item/laser_pointer/blue(src)
|
||||
new /obj/item/camera_film(src)
|
||||
new /obj/item/stamp/investigations(src)
|
||||
@@ -376,7 +379,7 @@
|
||||
new /obj/item/clothing/head/caphat/bridge_crew/alt(src)
|
||||
new /obj/item/clothing/glasses/sunglasses(src)
|
||||
new /obj/item/clothing/accessory/holster/waist(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/miniature(src)
|
||||
new /obj/item/gun/projectile/sec(src)
|
||||
new /obj/item/radio/headset/headset_com(src)
|
||||
new /obj/item/radio/headset/headset_com/alt(src)
|
||||
new /obj/item/radio/off(src)
|
||||
|
||||
@@ -108,8 +108,12 @@
|
||||
new /obj/item/clothing/suit/space/void/cruiser(src)
|
||||
new /obj/item/gun/energy/gun/nuclear(src)
|
||||
new /obj/item/gun/energy/gun/nuclear(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/magnum(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/magnum(src)
|
||||
new /obj/item/gun/projectile/sec/lethal(src)
|
||||
new /obj/item/gun/projectile/sec/lethal(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/gun/energy/net(src)
|
||||
new /obj/item/gun/projectile/automatic/x9(src)
|
||||
new /obj/item/gun/projectile/automatic/x9(src)
|
||||
@@ -124,7 +128,9 @@
|
||||
new /obj/item/clothing/head/helmet/space/void/cruiser(src)
|
||||
new /obj/item/clothing/suit/space/void/cruiser(src)
|
||||
new /obj/item/gun/energy/gun/nuclear(src)
|
||||
new /obj/item/gun/energy/disruptorpistol/magnum(src)
|
||||
new /obj/item/gun/projectile/sec/lethal(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
new /obj/item/ammo_magazine/c45m(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/gear_loadout/elyra/fill()
|
||||
new /obj/item/rig/elyran/equipped(src)
|
||||
|
||||
@@ -1,18 +1,5 @@
|
||||
//Weapons//
|
||||
|
||||
/singleton/cargo_item/disruptorpistol
|
||||
category = "weaponry"
|
||||
name = "disruptor pistol"
|
||||
supplier = "nanotrasen"
|
||||
description = "A nanotrasen designed blaster pistol with two settings: stun and lethal."
|
||||
price = 500
|
||||
items = list(
|
||||
/obj/item/gun/energy/disruptorpistol
|
||||
)
|
||||
access = ACCESS_ARMORY
|
||||
container_type = "crate"
|
||||
groupable = TRUE
|
||||
spawn_amount = 1
|
||||
/singleton/cargo_item/tasergun
|
||||
category = "weaponry"
|
||||
name = "taser gun"
|
||||
|
||||
@@ -22,6 +22,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
name = "syringe gun cartridge"
|
||||
path = /obj/item/syringe_cartridge
|
||||
|
||||
// Shotuns
|
||||
/singleton/fabricator_recipe/ammunition/shotgun
|
||||
name = "shells (blank, shotgun)"
|
||||
path = /obj/item/ammo_pile/shotgun_blanks
|
||||
@@ -48,6 +49,11 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
path = /obj/item/ammo_pile/shotgun_pellet
|
||||
security_level = SEC_LEVEL_RED
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/shotgun/practice
|
||||
name = "shells (buckshot, shotgun)"
|
||||
path = /obj/item/ammo_pile/shotgun_practice
|
||||
|
||||
// Revolvers
|
||||
/singleton/fabricator_recipe/ammunition/magazine_revolver_1
|
||||
name = "speed loader (.357)"
|
||||
path = /obj/item/ammo_magazine/a357
|
||||
@@ -63,6 +69,24 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
path = /obj/item/ammo_magazine/c38
|
||||
hack_only = TRUE
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/revolver_fourty_five
|
||||
name = "speedloader (.45, revolver)"
|
||||
path = /obj/item/ammo_magazine/c45/revolver
|
||||
security_level = SEC_LEVEL_RED
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/revolver_rubber
|
||||
name = "speedloader (.45, rubber, revolver)"
|
||||
path = /obj/item/ammo_magazine/c45/revolver/rubber
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/revolver_flash
|
||||
name = "speedloader (.45, flash, revolver)"
|
||||
path = /obj/item/ammo_magazine/c45/revolver/flash
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/revolver_practice
|
||||
name = "speedloader (.45, practice, revolver)"
|
||||
path = /obj/item/ammo_magazine/c45/revolver/practice
|
||||
|
||||
// .45 pistol
|
||||
/singleton/fabricator_recipe/ammunition/magazine_fourty_five
|
||||
name = "magazine (.45, pistol)"
|
||||
path = /obj/item/ammo_magazine/c45m
|
||||
@@ -76,11 +100,16 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
name = "magazine (.45, flash, pistol)"
|
||||
path = /obj/item/ammo_magazine/c45m/flash
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/magazine_practice
|
||||
name = "magazine (.45, practice, pistol)"
|
||||
path = /obj/item/ammo_magazine/c45m/practice
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/magazine_fourty_five/extended
|
||||
name = "magazine (.45, extended, pistol)"
|
||||
path = /obj/item/ammo_magazine/c45m/stendo
|
||||
security_level = SEC_LEVEL_RED
|
||||
|
||||
// .45 other
|
||||
/singleton/fabricator_recipe/ammunition/submachine_mag
|
||||
name = "magazine (.45, submachine gun)"
|
||||
path = /obj/item/ammo_magazine/submachinemag
|
||||
@@ -91,6 +120,7 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
path = /obj/item/ammo_magazine/c45uzi
|
||||
security_level = SEC_LEVEL_RED
|
||||
|
||||
// 9mm
|
||||
/singleton/fabricator_recipe/ammunition/magazine_stetchkin
|
||||
name = "magazine (9mm)"
|
||||
path = /obj/item/ammo_magazine/mc9mm
|
||||
@@ -109,11 +139,17 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
name = "magazine (9mm rubber, top mounted, machine pistol)"
|
||||
path = /obj/item/ammo_magazine/mc9mmt/rubber
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/magazine_smg_practice
|
||||
name = "magazine (9mm practice, top mounted, machine pistol)"
|
||||
path = /obj/item/ammo_magazine/mc9mmt/practice
|
||||
|
||||
// 10mm
|
||||
/singleton/fabricator_recipe/ammunition/magazine_c20r
|
||||
name = "magazine (10mm)"
|
||||
path = /obj/item/ammo_magazine/a10mm
|
||||
hack_only = TRUE
|
||||
|
||||
// 5.56mm
|
||||
/singleton/fabricator_recipe/ammunition/magazine_carbine
|
||||
name = "magazine (5.56mm, rifle)"
|
||||
path = /obj/item/ammo_magazine/a556
|
||||
@@ -134,6 +170,15 @@ ABSTRACT_TYPE(/singleton/fabricator_recipe/ammunition)
|
||||
path = /obj/item/ammo_magazine/a556/carbine/polymer
|
||||
security_level = SEC_LEVEL_RED
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/magazine_carbine_practice
|
||||
name = "magazine (5.56mm, practice, rifle)"
|
||||
path = /obj/item/ammo_magazine/a556/practice
|
||||
|
||||
/singleton/fabricator_recipe/ammunition/magazine_smallcarbine_practice
|
||||
name = "magazine (5.56mm, practice, carbine)"
|
||||
path = /obj/item/ammo_magazine/a556/carbine/practice
|
||||
|
||||
// 7.62mm
|
||||
/singleton/fabricator_recipe/ammunition/magazine_arifle
|
||||
name = "magazine (7.62mm)"
|
||||
path = /obj/item/ammo_magazine/c762
|
||||
|
||||
@@ -203,5 +203,8 @@
|
||||
/obj/item/ammo_pile/shotgun_stunshell
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/stunshell
|
||||
|
||||
/obj/item/ammo_pile/shotgun_practice
|
||||
ammo_type = /obj/item/ammo_casing/shotgun/practice
|
||||
|
||||
/obj/item/ammo_pile/fourty_five
|
||||
ammo_type = /obj/item/ammo_casing/c45
|
||||
|
||||
@@ -58,6 +58,18 @@ If nothing is chosen, reload sounds revert to the default, which is metal_slide_
|
||||
max_ammo = 6
|
||||
multiple_sprites = TRUE
|
||||
|
||||
/obj/item/ammo_magazine/c45/revolver/rubber
|
||||
name = "speed loader (.45 rubber)"
|
||||
ammo_type = /obj/item/ammo_casing/c45/rubber
|
||||
|
||||
/obj/item/ammo_magazine/c45/revolver/flash
|
||||
name = "speed loader (.45 flash)"
|
||||
ammo_type = /obj/item/ammo_casing/c45/flash
|
||||
|
||||
/obj/item/ammo_magazine/c45/revolver/practice
|
||||
name = "speed loader (.45 practice)"
|
||||
ammo_type = /obj/item/ammo_casing/c45/practice
|
||||
|
||||
// End of Revolvos //
|
||||
|
||||
// Pistols and handguns //
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
/obj/item/gun/energy/disruptorpistol
|
||||
name = "disruptor pistol"
|
||||
desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal."
|
||||
desc_extended = "Developed and produced by NanoTrasen for its internal security division, the NT DP-7 is a state of the art blaster pistol capable of firing reduced-power bolts which disrupt the central nervous system, inducing a stunning effect on the victim. It is also capable of firing full-power blaster bolts."
|
||||
icon = 'icons/obj/guns/disruptorpistol/disruptorpistols.dmi'
|
||||
icon_state = "disruptorpistol"
|
||||
item_state = "disruptorpistol"
|
||||
fire_sound = 'sound/weapons/gunshot/bolter.ogg'
|
||||
slot_flags = SLOT_BELT|SLOT_HOLSTER
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
force = 11
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 2000)
|
||||
projectile_type = /obj/projectile/energy/disruptorstun
|
||||
secondary_projectile_type = /obj/projectile/energy/blaster/disruptor
|
||||
max_shots = 10
|
||||
charge_cost = 150
|
||||
accuracy = 1
|
||||
has_item_ratio = FALSE
|
||||
modifystate = "disruptorpistolstun"
|
||||
sel_mode = 1
|
||||
firemodes = list(
|
||||
list(mode_name="stun", projectile_type=/obj/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
|
||||
list(mode_name="lethal", projectile_type=/obj/projectile/energy/blaster/disruptor, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
|
||||
)
|
||||
required_firemode_auth = list(WIRELESS_PIN_STUN, WIRELESS_PIN_LETHAL)
|
||||
var/selectframecheck = FALSE
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/practice
|
||||
name = "practice disruptor pistol"
|
||||
desc = "A variant of the NT DP-7. It fires less concentrated energy bolts that are visible, but ultimately harmless, designed for target practice."
|
||||
projectile_type = /obj/projectile/energy/disruptorstun/practice
|
||||
secondary_projectile_type = /obj/projectile/energy/blaster/disruptor/practice
|
||||
firemodes = list(
|
||||
list(mode_name="stun (practice)", projectile_type=/obj/projectile/energy/disruptorstun/practice, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
|
||||
list(mode_name="lethal (practice)", projectile_type=/obj/projectile/energy/blaster/disruptor/practice, modifystate="disruptorpistolkill", recoil = 1, fire_sound = 'sound/weapons/gunshot/bolter.ogg')
|
||||
)
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/security
|
||||
pin = /obj/item/firing_pin/wireless
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/miniature
|
||||
name = "miniature disruptor pistol"
|
||||
desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal. This is the miniature version."
|
||||
icon = 'icons/obj/guns/disruptorpistol/disruptorpistolc.dmi'
|
||||
max_shots = 8
|
||||
force = 3
|
||||
slot_flags = SLOT_BELT|SLOT_HOLSTER|SLOT_POCKET
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/miniature/security
|
||||
pin = /obj/item/firing_pin/wireless
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/magnum
|
||||
name = "magnum disruptor pistol"
|
||||
desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal. This is the magnum version."
|
||||
icon = 'icons/obj/guns/disruptorpistol/disruptorpistolm.dmi'
|
||||
max_shots = 15
|
||||
force = 14
|
||||
|
||||
/obj/item/gun/energy/disruptorpistol/magnum/security
|
||||
pin = /obj/item/firing_pin/wireless
|
||||
@@ -344,11 +344,11 @@ ABSTRACT_TYPE(/obj/item/gun/energy/gun/skrell)
|
||||
secondary_projectile_type = /obj/projectile/energy/blaster/skrell
|
||||
secondary_fire_sound = 'sound/weapons/laser3.ogg'
|
||||
can_switch_modes = TRUE
|
||||
projectile_type = /obj/projectile/energy/disruptorstun/skrell
|
||||
projectile_type = /obj/projectile/energy/disruptorskrell
|
||||
modifystate = "psipistolstun"
|
||||
|
||||
firemodes = list(
|
||||
list(mode_name="stun", projectile_type=/obj/projectile/energy/disruptorstun/skrell, modifystate="psipistolstun", fire_sound='sound/weapons/Taser.ogg'),
|
||||
list(mode_name="stun", projectile_type=/obj/projectile/energy/disruptorskrell, modifystate="psipistolstun", fire_sound='sound/weapons/Taser.ogg'),
|
||||
list(mode_name="lethal", projectile_type=/obj/projectile/energy/blaster/skrell, modifystate="psipistollethal", fire_sound='sound/weapons/laser3.ogg'),
|
||||
list(mode_name="ion", projectile_type=/obj/projectile/ion/small, modifystate="psipistolion", fire_sound='sound/weapons/laser1.ogg')
|
||||
)
|
||||
|
||||
@@ -138,6 +138,9 @@
|
||||
else
|
||||
icon_state = "secgunwood-e"
|
||||
|
||||
/obj/item/gun/projectile/sec/wood/lethal
|
||||
magazine_type = /obj/item/ammo_magazine/c45m
|
||||
|
||||
/obj/item/gun/projectile/automatic/x9
|
||||
name = "\improper Mk58-A machine pistol"
|
||||
desc = "A NanoTrasen-designed .45 sidearm, modified for fully-automatic fire. Issued to select security and law enforcement groups."
|
||||
|
||||
@@ -341,3 +341,18 @@
|
||||
ammo_type = /obj/item/ammo_casing/c45/revolver
|
||||
magazine_type = /obj/item/ammo_magazine/c45/revolver
|
||||
max_shells = 6
|
||||
|
||||
/obj/item/gun/projectile/revolver/security
|
||||
name = "C45 revolver"
|
||||
desc = "A Zavodskoi-designed .45 revolver, found among law enforcement and security support personnel."
|
||||
desc_extended = "The C45 is a .45 chambered revolver designed and manufactured by Zavodskoi Interstellar for use among security forces across the Spur. \
|
||||
Compact and minimalist, the C45 is prized for its form factor, low maintenance, and extremely long longevity. \
|
||||
Its low capacity sees it used primarily as a trusty back-up for personnel needing protection, but without the volume or firepower of a bulky automatic pistol."
|
||||
icon = 'icons/obj/guns/faction/zavodskoi_interstellar/sec_revolver.dmi'
|
||||
icon_state = "sec_revolver"
|
||||
item_state = "sec_revolver"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
caliber = ".45"
|
||||
ammo_type = /obj/item/ammo_casing/c45/rubber
|
||||
magazine_type = /obj/item/ammo_magazine/c45/revolver
|
||||
max_shells = 6
|
||||
|
||||
@@ -205,8 +205,8 @@
|
||||
/obj/projectile/bullet/pistol/rubber //"rubber" bullets
|
||||
name = "rubber bullet"
|
||||
check_armor = MELEE
|
||||
damage = 5
|
||||
agony = 40
|
||||
damage = 3
|
||||
agony = 30
|
||||
embed = 0
|
||||
|
||||
/obj/projectile/bullet/pistol/assassin
|
||||
|
||||
@@ -178,36 +178,11 @@
|
||||
muzzle_type = /obj/effect/projectile/muzzle/bolt
|
||||
impact_effect_type = /obj/effect/temp_visual/blaster_effect
|
||||
|
||||
/obj/projectile/energy/blaster/disruptor
|
||||
damage = 20
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
|
||||
/obj/projectile/energy/blaster/disruptor/practice
|
||||
damage = 5
|
||||
damage_type = DAMAGE_PAIN
|
||||
eyeblur = 0
|
||||
|
||||
/obj/projectile/energy/blaster/skrell // for nralakk fed consular pistol
|
||||
damage = 30
|
||||
armor_penetration = 5
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
|
||||
/obj/projectile/energy/disruptorstun
|
||||
name = "disruptor bolt"
|
||||
icon_state = "bluelaser"
|
||||
damage = 1
|
||||
agony = 40
|
||||
speed = 0.4
|
||||
damage_type = DAMAGE_BURN
|
||||
eyeblur = 1
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
muzzle_type = /obj/effect/projectile/muzzle/bolt
|
||||
|
||||
/obj/projectile/energy/disruptorstun/practice
|
||||
damage = 5
|
||||
damage_type = DAMAGE_PAIN
|
||||
eyeblur = 0
|
||||
|
||||
/obj/projectile/energy/blaster/heavy
|
||||
damage = 35
|
||||
armor_penetration = 10
|
||||
@@ -218,5 +193,13 @@
|
||||
armor_penetration = 60
|
||||
incinerate = 2
|
||||
|
||||
/obj/projectile/energy/disruptorstun/skrell // for nralakk fed consular pistol
|
||||
/obj/projectile/energy/disruptorskrell // for nralakk fed consular pistol
|
||||
name = "disruptor bolt"
|
||||
icon_state = "bluelaser"
|
||||
damage = 1
|
||||
agony = 45
|
||||
speed = 0.4
|
||||
damage_type = DAMAGE_BURN
|
||||
eyeblur = 1
|
||||
pass_flags = PASSTABLE | PASSRAILING
|
||||
muzzle_type = /obj/effect/projectile/muzzle/bolt
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
author: TheGreyWolf
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Replaces security officers and the wardens disruptors with .45 loaded with rubbers, and a spare rubber mag."
|
||||
- rscadd: "Replaced investigators disruptor with a .45 revolver loaded with rubbers, and a spare rubber speedloader."
|
||||
- rscadd: "Added the ability for the autolathe to print .45 speedloaders for the investigators handgun."
|
||||
- rscadd: "Added .45 revolver speedloaders to the armory."
|
||||
- rscadd: "Added practice rounds to the autolathe."
|
||||
- balance: "Reduced the effectiveness of rubber bullets."
|
||||
- rscdel: "Removed all disruptors, replacing them with ballistics and for the elyran ERT with plasma pistols."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 998 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 591 B |
Reference in New Issue
Block a user