Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ATTACHMENT FLAVOR TEXT GO #276

Merged
merged 23 commits into from
Aug 17, 2024
Merged

ATTACHMENT FLAVOR TEXT GO #276

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1694999
ATTACHMENT FLAVOR TEXT GO
KoishiVibe Jun 2, 2024
0624eb2
fixed minor errors
Jun 2, 2024
1c29ffb
fuckem buckem zuccem
Jun 2, 2024
dd24046
im gonna grab androbetel. nominally makes UPP weapons now accept thei…
Jun 2, 2024
37b785d
...that should be all.
Jun 2, 2024
17c1fae
Merge branch 'master' into attachments-flavor-textinator
KoishiVibe Jun 2, 2024
1013d96
hopefully final change
Jun 2, 2024
06249c8
Merge branch 'PvE-CMSS13:master' into attachments-flavor-textinator
KoishiVibe Jun 2, 2024
0251df0
bugfix
KoishiVibe Jun 3, 2024
792a14d
unfucks that specifically
KoishiVibe Jun 7, 2024
28acc6c
Merge remote-tracking branch 'upstream/master' into attachments-flavo…
KoishiVibe Jun 13, 2024
70c04a8
I don't know if this worked or not.
KoishiVibe Jun 13, 2024
3c77800
weapon actual sprites for laser noew
KoishiVibe Jun 13, 2024
a7e21ca
offset tweak
KoishiVibe Jun 13, 2024
09556a8
fix
KoishiVibe Jun 13, 2024
ea7ff77
Merge branch 'master' into attachments-flavor-textinator
KoishiVibe Jun 20, 2024
7c21062
Merge branch 'master' into attachments-flavor-textinator
KoishiVibe Jul 24, 2024
96f1fc3
Merge branch 'master' into attachments-flavor-textinator
KoishiVibe Jul 31, 2024
d0cd61d
converts subtype to /upp instead of /union
Jul 31, 2024
d5a11f9
Merge branch 'master' into attachments-flavor-textinator
KoishiVibe Aug 11, 2024
3e3e1fc
commits DMC suggestion
KoishiVibe Aug 11, 2024
a662477
we did it, we fixed the one shitty bug. also
KoishiVibe Aug 13, 2024
10f4fe1
Merge branch 'attachments-flavor-textinator' of https://github.com/Ko…
KoishiVibe Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
382 changes: 191 additions & 191 deletions code/modules/gear_presets/upp.dm
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

38 changes: 27 additions & 11 deletions code/modules/projectiles/guns/rifles.dm
View file
Open in desktop
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/union,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/union,
/obj/item/attachable/reddot,
/obj/item/attachable/reddot/union,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/union,
/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/union,
/obj/item/attachable/flashlight/grip,
/obj/item/attachable/flashlight/grip/union,
/obj/item/attachable/lasersight,
/obj/item/attachable/lasersight/union,
/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/union,
/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/union,
)

/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/union,
/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/union,
/obj/item/attachable/verticalgrip/union,
)

/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/union,
/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/union,
/obj/item/attachable/scope/mini,
/obj/item/attachable/reddot,
/obj/item/attachable/scope/mini/union,
/obj/item/attachable/reddot/union,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/union,
/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/union,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/union,
)
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/union,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini/union,
/obj/item/attachable/reddot,
/obj/item/attachable/reddot/union,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/union,
/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/union,
/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/union,
/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/union,
)

/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/union,
)
random_spawn_chance = 0
random_spawn_rail = list()
Expand Down
11 changes: 9 additions & 2 deletions code/modules/projectiles/guns/shotguns.dm
View file
Open in desktop
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/union,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/union,
/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/union,
/obj/item/attachable/flashlight/grip,
/obj/item/attachable/flashlight/grip/union,
/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/union,
)

/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/union,
)

/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/union,
/obj/item/attachable/reflex,
/obj/item/attachable/reflex/union,
/obj/item/attachable/flashlight,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/verticalgrip, //Underbarrel
/obj/item/attachable/verticalgrip/union,
/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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@
/obj/item/attachable/bayonet/upp,
//Under,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/verticalgrip/union,
/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
Open in desktop
Binary file not shown.
Loading