cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deck 3 Security Mapping Oversights Fixes (#15080)

Browse Source
This commit is contained in:
SleepyGemmy
2022-11-12 22:56:29 +01:00
committed by GitHub
parent 1a5b0eac03
commit 2d06230cd1
17 changed files with 224 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/bang/pistol.dm
View File

@@ -8,7 +8,7 @@
pixel_offset_y = 18
/obj/item/gun/bang/sec
name = ".45 pistol"
name = "\improper .45 pistol"
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
icon = 'icons/obj/guns/secgun.dmi'
@@ -21,9 +21,9 @@
name = ".45 signal pistol"
/obj/item/gun/bang/sec/wood
name = "custom .45 pistol"
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a wooden grip. It uses .45 rounds."
name = "custom .45 Pistol"
icon = 'icons/obj/guns/secgun_wood.dmi'
icon_state = "secgunwood"
item_state = "secgunwood"

16
code/modules/projectiles/guns/energy/disrupter.dm → code/modules/projectiles/guns/energy/disruptor.dm
View File

@@ -1,5 +1,3 @@
/obj/item/gun/energy/disruptorpistol
name = "disruptor pistol"
desc = "A NanoTrasen designed blaster pistol with two settings: stun and lethal."
@@ -14,7 +12,7 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 2000)
projectile_type = /obj/item/projectile/energy/disruptorstun
secondary_projectile_type = /obj/item/projectile/energy/blaster
secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor
max_shots = 10
charge_cost = 150
accuracy = 1
@@ -24,10 +22,20 @@
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/energy/disruptorstun, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/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/item/projectile/energy/disruptorstun/practice
secondary_projectile_type = /obj/item/projectile/energy/blaster/disruptor/practice
firemodes = list(
list(mode_name="stun (practice)", projectile_type=/obj/item/projectile/energy/disruptorstun/practice, modifystate="disruptorpistolstun", fire_sound = 'sound/weapons/gunshot/bolter.ogg'),
list(mode_name="lethal (practice)", projectile_type=/obj/item/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/device/firing_pin/wireless

5
code/modules/projectiles/guns/energy/rifle.dm
View File

@@ -60,6 +60,11 @@
firemodes = list()
modifystate = null
/obj/item/gun/energy/rifle/laser/practice
name = "practice laser rifle"
desc = "A modified version of the NT LR-6. It fires less concentrated laser beams that are visible, but ultimately harmless, designed for target practice."
projectile_type = /obj/item/projectile/beam/practice
/obj/item/gun/energy/rifle/laser/noctiluca
name = "combat laser rifle"
desc = "The Noctiluca XM/24 is a brand new model of laser rifle, developed entirely by Kumar Arms, a Zavodskoi Interstellar subsidiary. Easy to handle for users with minimal training, reliable and with a reasonable form factor, it is poised to become the new standard for laser weaponry."

4
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -88,7 +88,7 @@
icon_state = "coltauto-e"
/obj/item/gun/projectile/sec
name = ".45 pistol"
name = "\improper .45 pistol"
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. Uses .45 rounds."
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. It uses .45 rounds."
icon = 'icons/obj/guns/secgun.dmi'
@@ -118,9 +118,9 @@
magazine_type = /obj/item/ammo_magazine/c45m/flash
/obj/item/gun/projectile/sec/wood
name = "custom .45 pistol"
desc = "A NanoTrasen designed sidearm, found among law enforcement and security forces. It has a wooden grip. Uses .45 rounds."
desc_fluff = "The NT Mk58 is a ballistic sidearm developed and produced by NanoTrasen. Bulky and heavy, the Mk58 is nonetheless used by security forces and law enforcement for its ease of use, low maintenance requirement, longevity, reliability - and most of all, extremely inexpensive price tag. A trademark of NanoTrasen security forces. This one has a faux wooden grip. It uses .45 rounds."
name = "custom .45 Pistol"
icon = 'icons/obj/guns/secgun_wood.dmi'
icon_state = "secgunwood"
item_state = "secgunwood"