cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the Security Laser Rifle (#20602)

Browse Source 
* security laser rifle

* RnD magazines, yum

* "Hey Drake, where's the req_tech?"

* increases ammo count to 20. flattens magazines.

* RIP small magazines

* fixes it being unprintable, oopsies

* caseless laser rounds
This commit is contained in:
Coolrune206
2023-03-26 11:43:19 +01:00
committed by GitHub
parent 6bb5674928
commit d559f2ce89
7 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+2 -2
View File
@@ -465,8 +465,8 @@
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/laser
desc = "An experimental laser casing."
/obj/item/ammo_casing/caseless/laser
desc = "An experimental laser casing, designed to vaporize when fired."
caliber = "laser"
projectile_type = /obj/item/projectile/beam/laser
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
code/modules/projectiles/ammunition/magazines.dm
+3 -3
View File
@@ -495,10 +495,10 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
/obj/item/ammo_box/magazine/laser
name = "encased laser projector magazine"
desc = "Fits experimental laser ammo casings."
name = "laser carbine projector magazine"
desc = "Fits experimental laser ammo casings. Compatible with laser rifles and carbines."
icon_state = "laser"
ammo_type = /obj/item/ammo_casing/laser
ammo_type = /obj/item/ammo_casing/caseless/laser
origin_tech = "combat=3"
caliber = "laser"
max_ammo = 20
code/modules/projectiles/guns/projectile/automatic.dm
+19
View File
@@ -319,3 +319,22 @@
/obj/item/gun/projectile/automatic/lasercarbine/update_icon_state()
icon_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
item_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
/obj/item/gun/projectile/automatic/laserrifle
name = "security laser rifle"
desc = "A bulky, single barreled rifle that uses disposable laser cartridges rather than an internal power cell. Utilized by Nanotrasen's private security force."
icon_state = "laserrifle"
item_state = "lasercarbine"
w_class = WEIGHT_CLASS_BULKY
origin_tech = "combat=3;materials=2"
mag_type = /obj/item/ammo_box/magazine/laser
fire_sound = 'sound/weapons/gunshots/gunshot_lascarbine.ogg'
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
can_suppress = FALSE
burst_size = 1
actions_types = list()
/obj/item/gun/projectile/automatic/laserrifle/update_icon_state()
icon_state = "laserrifle[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
item_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"