Skip to content

Commit 88f2beb

Browse files
GlamyrioGlamyrio
committed
syndie gun
1 parent cdcc1fc commit 88f2beb

9 files changed

Lines changed: 107 additions & 26 deletions

File tree

‎modular_meta/features/security_extended/code/spawners.dm‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@
33
/obj/effect/spawner/random/armory/laser_gun/spawn_loot(lootcount_override)
44
. = ..()
55
new /obj/item/ammo_box/magazine/recharge(get_turf(src))
6-
new /obj/item/gun/ballistic/automatic/laser/security(get_turf(src))
6+
new /obj/item/gun/ballistic/automatic/laser/station(get_turf(src))
77

8-
/obj/effect/spawner/random/baton_or_tonfa
9-
name = "baton or tonfa spawner"
10-
loot = list(
11-
/obj/item/melee/baton/security/loaded = 2,
8+
/obj/machinery/vending/autodrobe/Initialize(mapload)
9+
.=..()
10+
premium += list(
1211
/obj/item/melee/tonfa = 1,
1312
)
14-
15-
/obj/item/storage/belt/security/full/PopulateContents()
16-
new /obj/item/reagent_containers/spray/pepper(src)
17-
new /obj/item/restraints/handcuffs(src)
18-
new /obj/item/grenade/flashbang(src)
19-
new /obj/item/assembly/flash/handheld(src)
20-
new /obj/effect/spawner/random/baton_or_tonfa(src)
21-
update_appearance()

‎modular_meta/features/security_extended/code/supply/security_pack.dm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
name = "Security Laser Rifle Crate"
33
desc = "Contains single Security Laser Rifle and powerpack to it. Developed by Research Nanotrasen group. \
44
For security department, ."
5-
cost = CARGO_CRATE_VALUE * 8
6-
contains = list(/obj/item/gun/ballistic/automatic/laser/security = 1, /obj/item/ammo_box/magazine/recharge = 2)
5+
cost = CARGO_CRATE_VALUE * 10
6+
contains = list(/obj/item/gun/ballistic/automatic/laser/station = 1, /obj/item/ammo_box/magazine/recharge/station = 2)
77
crate_name = "security laser rifle crate"
88
crate_type = /obj/structure/closet/crate/secure/plasma
99

@@ -13,9 +13,9 @@
1313
in the Security Laser Rifle."
1414
cost = CARGO_CRATE_VALUE * 6.5
1515
access_view = ACCESS_ARMORY
16-
contains = list(/obj/item/ammo_box/magazine/recharge = 3,
17-
/obj/item/ammo_box/magazine/recharge/stun = 1,
18-
/obj/item/ammo_box/magazine/recharge/scatter = 1,
16+
contains = list(/obj/item/ammo_box/magazine/recharge/station = 3,
17+
/obj/item/ammo_box/magazine/recharge/station/stun = 1,
18+
/obj/item/ammo_box/magazine/recharge/station/scatter = 1,
1919
)
2020
crate_name = "ammo crate"
2121

‎modular_meta/features/security_extended/code/weapon/guns.dm‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/obj/item/gun/ballistic/automatic/laser/security //damage slightly worse than egun has but it has rechargeable magazine
1+
/obj/item/gun/ballistic/automatic/laser/station //damage slightly worse than egun has but it has rechargeable magazine
22
name = "security laser rifle"
33
projectile_damage_multiplier = 0.9
44
projectile_speed_multiplier = 1.2
@@ -9,17 +9,18 @@
99
base_icon_state = "laser_rifle"
1010
fire_delay = 0
1111

12-
/obj/item/ammo_box/magazine/recharge
12+
/obj/item/ammo_box/magazine/recharge/station
1313
w_class = WEIGHT_CLASS_SMALL
14+
max_ammo = 16
1415

15-
/obj/item/ammo_box/magazine/recharge/emp_act(severity)
16+
/obj/item/ammo_box/magazine/recharge/station/emp_act(severity)
1617
. = ..()
1718
if(!(. & EMP_PROTECT_CONTENTS))
1819
stored_ammo = list(0)
1920
update_desc()
2021
return TRUE
2122

22-
/obj/item/ammo_box/magazine/recharge/stun
23+
/obj/item/ammo_box/magazine/recharge/station/stun
2324
name = "stun type power pack"
2425
desc = "A rechargeable, non-lethal, detachable battery that serves as a magazine for laser rifles."
2526
ammo_type = /obj/item/ammo_casing/laser/stun
@@ -29,10 +30,10 @@
2930
harmful = FALSE
3031
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
3132

32-
/obj/item/ammo_box/magazine/recharge/scatter
33+
/obj/item/ammo_box/magazine/recharge/station/scatter
3334
name = "scatter type power pack"
3435
ammo_type = /obj/item/ammo_casing/laser/scatter
35-
max_ammo = 12
36+
max_ammo = 8
3637

3738
/obj/item/ammo_casing/laser/scatter
3839
projectile_type = /obj/projectile/beam/scatter/ldmg

‎modular_meta/features/uplink_items/code/uplink.dm‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,20 @@
1818

1919
///Обычные предметы в аплинках трейторов
2020
//dangerous категория
21+
/datum/uplink_item/dangerous/lrifle
22+
name = "Compact Laser Rifle"
23+
desc = "Rechargeable energy gun, that developed by 'Cybersun'. \
24+
Comes in briefcase with 2 magazines, you can fold this, but lose accuracy."
25+
item = /obj/item/storage/toolbox/guncase/traitor/lrifle
26+
cost = 12
27+
purchasable_from = ~UPLINK_ALL_SYNDIE_OPS
28+
2129
/datum/uplink_item/dangerous/backstab
2230
name = "Backstabing Knife"
2331
desc = "A specially designed syndicate's finest knife. \
2432
Used for stealthy assasinations, will deal bonus damage upon a hit from the back!"
2533
item = /obj/item/switchblade/backstab
26-
27-
cost = 10
34+
cost = 8
2835
purchasable_from = ~UPLINK_ALL_SYNDIE_OPS
2936

3037
//device tools категория

‎modular_meta/features/uplink_items/code/weaponry/ammo_types.dm‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/obj/item/ammo_box/magazine/recharge/station/syndi
2+
desc = "A rechargeable, detachable battery that serves as a magazine for laser rifles. Has a 'Cybersun' trademark."
3+
ammo_type = /obj/item/ammo_casing/laser/lrifle_cybersun
4+
5+
/obj/item/ammo_casing/laser/lrifle_cybersun
6+
projectile_type = /obj/projectile/beam/laser/lrifle_cybersun
7+
fire_sound = 'sound/items/weapons/laser2.ogg'
8+
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
9+
10+
/obj/projectile/beam/laser/lrifle_cybersun
11+
name = "red plasma beam"
12+
icon_state = "lava"
13+
light_color = COLOR_DARK_RED
14+
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
15+
damage = 20
16+
wound_bonus = -30

‎modular_meta/features/uplink_items/code/weaponry/guncase.dm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/datum/storage/toolbox/guncase/compact_lrifle
2+
max_slots = 3
3+
max_total_storage = 6
4+
5+
/obj/item/storage/toolbox/guncase/traitor/lrifle
6+
name = "compact laser rifle gun case"
7+
storage_type = /datum/storage/toolbox/guncase/compact_lrifle
8+
weapon_to_spawn = /obj/item/gun/ballistic/automatic/laser/station/syndicate/compact/guncase
9+
extra_to_spawn = /obj/item/ammo_box/magazine/recharge/syndi
10+
ammo_box_to_spawn = null

‎modular_meta/features/uplink_items/code/weaponry/lrifle.dm‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/obj/item/gun/ballistic/automatic/laser/station/syndicate
2+
name = "laser rifle"
3+
desc = "Seems like an illegal and deadly weapon. Has a 'Cybersun' marking."
4+
projectile_damage_multiplier = 1
5+
icon = 'modular_meta/features/uplink_items/icons/weapon/lrifle.dmi'
6+
7+
/obj/item/gun/ballistic/automatic/laser/station/syndicate/compact
8+
name = "compact laser rifle"
9+
var/folded = FALSE
10+
11+
/obj/item/gun/ballistic/automatic/laser/station/syndicate/compact/update_icon_state()
12+
. = ..()
13+
if(folded)
14+
icon_state = "laser_rifle_folded"
15+
base_icon_state = "laser_rifle_folded"
16+
else
17+
icon_state = "laser_rifle"
18+
base_icon_state = "laser_rifle"
19+
20+
/obj/item/gun/ballistic/automatic/laser/station/syndicate/compact/click_alt(mob/user)
21+
if(!user.can_perform_action(src, ALLOW_SILICON_REACH))
22+
return CLICK_ACTION_BLOCKING
23+
24+
user.changeNext_move(CLICK_CD_MELEE)
25+
26+
if(!folded)
27+
folded = TRUE
28+
w_class = WEIGHT_CLASS_NORMAL
29+
spread = 30
30+
icon_state = "laser_rifle_folded"
31+
base_icon_state = "laser_rifle_folded"
32+
balloon_alert(user, "folded")
33+
playsound(src, 'sound/items/weapons/gun/l6/l6_rack.ogg', 50, TRUE)
34+
else
35+
folded = FALSE
36+
w_class = WEIGHT_CLASS_BULKY
37+
spread = 0
38+
icon_state = "laser_rifle"
39+
base_icon_state = "laser_rifle"
40+
balloon_alert(user, "deployed")
41+
playsound(src, 'sound/items/weapons/gun/l6/l6_door.ogg', 50, TRUE)
42+
43+
update_appearance()
44+
if(ismob(loc))
45+
var/mob/living/M = loc
46+
M.update_held_items()
47+
48+
return CLICK_ACTION_SUCCESS
49+
50+
/obj/item/gun/ballistic/automatic/laser/station/syndicate/compact/guncase
51+
folded = TRUE
52+
spread = 30
53+
spawn_magazine_type = /obj/item/ammo_box/magazine/recharge/syndi

‎modular_meta/features/uplink_items/icons/weapon/lrifle.dmi‎

934 Bytes
Binary file not shown.

‎modular_meta/features/uplink_items/includes.dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#include "code\bundle\crate.dm"
66
#include "code\bundle\bundles.dm"
77
#include "code\clothing\engset.dm"
8+
#include "code\weaponry\ammo_types.dm"
9+
#include "code\weaponry\guncase.dm"
10+
#include "code\weaponry\lrifle.dm"
811
#include "code\justice_mecha.dm"
912
#include "code\adrenals.dm"
1013

0 commit comments

Comments
 (0)