Skip to content

Commit

Permalink
ATTACHMENT FLAVOR TEXT GO (#276)
Browse files Browse the repository at this point in the history 
Co-authored-by: KoishiVibe <[email protected]>
Co-authored-by: Doubleumc <[email protected]>
  • Loading branch information
@KoishiVibe @Doubleumc
3 people authored Aug 17, 2024
1 parent e1e6502 commit cf4b576
Show file tree
Hide file tree
Showing 6 changed files with 294 additions and 241 deletions.
382 changes: 191 additions & 191 deletions code/modules/gear_presets/upp.dm
View file

Large diffs are not rendered by default.

103 changes: 66 additions & 37 deletions code/modules/projectiles/gun_attachables.dm
View file

Large diffs are not rendered by default.

38 changes: 27 additions & 11 deletions code/modules/projectiles/guns/rifles.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1302,17 +1302,24 @@
/obj/item/attachable/flashlight, // Rail
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/scope,
/obj/item/attachable/scope/upp,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/upp,
/obj/item/attachable/reddot,
/obj/item/attachable/reddot/upp,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/suppressor, // Muzzle
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/verticalgrip, // Underbarrel
/obj/item/attachable/verticalgrip/upp,
/obj/item/attachable/flashlight/grip,
/obj/item/attachable/flashlight/grip/upp,
/obj/item/attachable/lasersight,
/obj/item/attachable/lasersight/upp,
/obj/item/attachable/burstfire_assembly,
/obj/item/attachable/attached_gun/flamer,
/obj/item/attachable/attached_gun/flamer/advanced,
Expand Down Expand Up @@ -1355,7 +1362,7 @@
random_spawn_chance = 100
random_rail_chance = 70
random_spawn_rail = list(
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
)
random_muzzle_chance = 100
Expand All @@ -1364,14 +1371,14 @@
)
random_under_chance = 40
random_spawn_under = list(
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
)

/obj/item/weapon/gun/rifle/type71/dual
random_spawn_chance = 100
random_rail_chance = 70
random_spawn_rail = list(
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
)
random_muzzle_chance = 100
Expand All @@ -1380,16 +1387,16 @@
)
random_under_chance = 40
random_spawn_under = list(
/obj/item/attachable/lasersight,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/lasersight/upp,
/obj/item/attachable/verticalgrip/upp,
)

/obj/item/weapon/gun/rifle/type71/sapper
current_mag = /obj/item/ammo_magazine/rifle/type71/ap
random_spawn_chance = 100
random_rail_chance = 80
random_spawn_rail = list(
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
)
Expand All @@ -1410,9 +1417,12 @@
/obj/item/attachable/flashlight, // Rail
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/scope,
/obj/item/attachable/scope/upp,
/obj/item/attachable/scope/mini,
/obj/item/attachable/reddot,
/obj/item/attachable/scope/mini/upp,
/obj/item/attachable/reddot/upp,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/suppressor, // Muzzle
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
Expand All @@ -1431,10 +1441,10 @@
random_spawn_chance = 100
random_rail_chance = 100
random_spawn_rail = list(
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/upp,
)
random_muzzle_chance = 100
random_spawn_muzzle = list(
Expand All @@ -1454,15 +1464,20 @@
/obj/item/attachable/flashlight, // Rail
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/scope,
/obj/item/attachable/scope/upp,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/upp,
/obj/item/attachable/reddot,
/obj/item/attachable/reddot/upp,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/suppressor, // Muzzle
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/verticalgrip, // Underbarrel
/obj/item/attachable/verticalgrip/upp,
/obj/item/attachable/burstfire_assembly,
)

Expand All @@ -1485,7 +1500,7 @@
random_spawn_chance = 100
random_rail_chance = 70
random_spawn_rail = list(
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
)
random_muzzle_chance = 100
Expand All @@ -1494,7 +1509,7 @@
)
random_under_chance = 40
random_spawn_under = list(
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
)

/obj/item/weapon/gun/rifle/type71/carbine/commando
Expand All @@ -1509,6 +1524,7 @@
current_mag = /obj/item/ammo_magazine/rifle/type71/ap
attachable_allowed = list(
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
)
random_spawn_chance = 0
random_spawn_rail = list()
Expand Down
11 changes: 9 additions & 2 deletions code/modules/projectiles/guns/shotguns.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,14 +374,18 @@ can cause issues with ammo types getting mixed up during the burst.
current_mag = /obj/item/ammo_magazine/internal/shotgun/type23
attachable_allowed = list(
/obj/item/attachable/reddot, // Rail
/obj/item/attachable/reddot/upp,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/bayonet, // Muzzle
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/verticalgrip, // Underbarrel
/obj/item/attachable/verticalgrip/upp,
/obj/item/attachable/flashlight/grip,
/obj/item/attachable/flashlight/grip/upp,
/obj/item/attachable/attached_gun/flamer,
/obj/item/attachable/attached_gun/flamer/advanced,
/obj/item/attachable/attached_gun/extinguisher,
Expand Down Expand Up @@ -421,7 +425,7 @@ can cause issues with ammo types getting mixed up during the burst.
)
random_under_chance = 40
random_spawn_under = list(
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
)

/obj/item/weapon/gun/shotgun/type23/breacher/slug
Expand All @@ -444,7 +448,7 @@ can cause issues with ammo types getting mixed up during the burst.
random_under_chance = 100
random_spawn_under = list(
/obj/item/attachable/flashlight/grip,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
)

/obj/item/weapon/gun/shotgun/type23/dragon
Expand All @@ -470,10 +474,13 @@ can cause issues with ammo types getting mixed up during the burst.
current_mag = /obj/item/ammo_magazine/internal/shotgun/type23/beanbag
attachable_allowed = list(
/obj/item/attachable/reddot, //Rail
/obj/item/attachable/reddot/upp,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/upp,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/verticalgrip, //Underbarrel
/obj/item/attachable/verticalgrip/upp,
/obj/item/attachable/stock/type23, //Stock
)
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_INTERNAL_MAG
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/specialist/sniper.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@
/obj/item/attachable/bayonet/upp,
//Under,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/upp,
/obj/item/attachable/bipod,
//Integrated,
/obj/item/attachable/type88_barrel,
Expand Down
Binary file modified icons/obj/items/weapons/guns/attachments/under.dmi
View file
Binary file not shown.

0 comments on commit cf4b576

Please sign in to comment.