cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 03:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaces security disruptors with ballistics and removes all disruptors (#21987)

Browse Source 
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
2026-03-25 22:19:47 +01:00
committed by GitHub
parent 55b2740cdb
commit f09bcd6cdd
30 changed files with 136 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_pile.dm
+3
View File
@@ -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
code/modules/projectiles/ammunition/boxes.dm
+12
View File
@@ -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 //
code/modules/projectiles/guns/energy/disruptor.dm
-62
View File
@@ -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
code/modules/projectiles/guns/energy/nuclear.dm
+2 -2
View File
@@ -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')
)
code/modules/projectiles/guns/projectile/pistol.dm
+3
View File
@@ -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."
code/modules/projectiles/guns/projectile/revolver.dm
+15
View File
@@ -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
code/modules/projectiles/projectile/bullets.dm
+2 -2
View File
@@ -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
code/modules/projectiles/projectile/energy.dm
+9 -26
View File
@@ -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