Skip to content

Commit 6394f34

Browse files
authored
repaths projectile weapons from /obj/item/gun/* to /obj/item/gun/projectile/* (#6997)
tl;dr we don't want snowflaking for "projectile firing gun" to be the same as "launcher firing gun" so we're separating them this is in prep for #6740
1 parent b4839bf commit 6394f34

File tree

287 files changed

+3040
-3040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+3040
-3040
lines changed

code/__DEFINES/projectiles/gun.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//* This file is explicitly licensed under the MIT license. *//
22
//* Copyright (c) 2024 Citadel Station Developers *//
33

4-
//* rendering enums - /obj/item/gun/ballistic *//
4+
//* rendering enums - /obj/item/gun/projectile/ballistic *//
55

66
//? render_bolt_overlay
77

code/__HELPERS/type_processing.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
/obj/item/mecha_parts = "//mech_part",
2121
/obj/item/organ = "//organ",
2222
/obj/item/gun_attachment = "//gun-attachment",
23-
/obj/item/gun/ballistic = "//gun-ballistic",
24-
/obj/item/gun/energy = "//gun-energy",
23+
/obj/item/gun/projectile/ballistic = "//gun-ballistic",
24+
/obj/item/gun/projectile/energy = "//gun-energy",
2525
/obj/item/gun/magnetic = "//gun-magnetic",
2626
/obj/item/gun = "//gun",
2727
/obj/item/ammo_casing = "//ammo",

code/datums/outfits/costumes/halloween.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
for(var/obj/item/briefcase_item in new_briefcase)
2727
qdel(briefcase_item)
2828
new_briefcase.contents += new /obj/item/toy/crossbow
29-
new_briefcase.contents += new /obj/item/gun/ballistic/revolver/capgun
29+
new_briefcase.contents += new /obj/item/gun/projectile/ballistic/revolver/capgun
3030
new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat
3131
H.put_in_hands_or_del(new_briefcase)
3232

@@ -38,7 +38,7 @@
3838
glasses = /obj/item/clothing/glasses/fakesunglasses
3939
mask = /obj/item/clothing/mask/fakemoustache
4040
head = /obj/item/clothing/head/beret
41-
r_hand = /obj/item/gun/ballistic/revolver/capgun
41+
r_hand = /obj/item/gun/projectile/ballistic/revolver/capgun
4242

4343
/datum/outfit/costume/horrorcop/post_equip(var/mob/living/carbon/human/H)
4444
var/obj/item/clothing/under/U = H.inventory.get_slot_single(/datum/inventory_slot/inventory/uniform)
@@ -55,7 +55,7 @@
5555
head = /obj/item/clothing/head/cowboy_hat
5656
gloves = /obj/item/clothing/gloves/fingerless
5757
suit = /obj/item/clothing/accessory/poncho
58-
r_hand = /obj/item/gun/ballistic/revolver/capgun
58+
r_hand = /obj/item/gun/projectile/ballistic/revolver/capgun
5959

6060
/datum/outfit/costume/cowboy/post_equip(var/mob/living/carbon/human/H)
6161
var/obj/item/clothing/under/U = H.inventory.get_slot_single(/datum/inventory_slot/inventory/uniform)

code/datums/outfits/ghostrole.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
suit = /obj/item/clothing/suit/armor/ashlander
3131
shoes = /obj/item/clothing/shoes/ashwalker
3232
belt = /obj/item/storage/belt/quiver/full/ash
33-
back = /obj/item/gun/ballistic/bow/ashen
33+
back = /obj/item/gun/projectile/ballistic/bow/ashen
3434
r_hand = /obj/item/material/knife/tacknife/combatknife/bone
3535

3636
/datum/outfit/ashlander/merchant
3737
name = "Ashlander - Merchant"
3838
shoes = /obj/item/clothing/shoes/ashwalker
39-
belt = /obj/item/gun/ballistic/musket/pistol/tribal
39+
belt = /obj/item/gun/projectile/ballistic/musket/pistol/tribal
4040
l_hand = /obj/item/storage/box/munition_box
4141
r_hand = /obj/item/reagent_containers/glass/powder_horn/tribal/filled
4242

@@ -46,7 +46,7 @@
4646
suit = /obj/item/clothing/suit/armor/ashlander
4747
shoes = /obj/item/clothing/shoes/ashwalker
4848
belt = /obj/item/reagent_containers/glass/powder_horn/tribal/filled
49-
r_hand = /obj/item/gun/ballistic/musket/tribal
49+
r_hand = /obj/item/gun/projectile/ballistic/musket/tribal
5050
l_hand = /obj/item/storage/box/munition_box
5151

5252
/datum/outfit/ashlander/priest
@@ -68,7 +68,7 @@
6868

6969
/datum/outfit/pirate/immigrant
7070
name = "Pirate - Immigrant"
71-
belt = /obj/item/gun/ballistic/pirate
71+
belt = /obj/item/gun/projectile/ballistic/pirate
7272
r_pocket = /obj/item/melee/transforming/energy/sword/cutlass
7373

7474
/datum/outfit/pirate/dilettante
@@ -84,6 +84,6 @@
8484
suit = /obj/item/clothing/suit/armor/tactical/pirate
8585
shoes = /obj/item/clothing/shoes/boots/jackboots
8686
mask = /obj/item/clothing/mask/balaclava
87-
belt = /obj/item/gun/energy/zip
87+
belt = /obj/item/gun/projectile/energy/zip
8888
r_pocket = /obj/item/melee/transforming/energy/sword/cutlass
8989
r_hand = /obj/item/shield/makeshift

code/datums/outfits/horror_killers.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
qdel(briefcase_item)
5656
for(var/i=3, i>0, i--)
5757
sec_briefcase.contents += new /obj/item/spacecash/c1000
58-
sec_briefcase.contents += new /obj/item/gun/energy/crossbow
59-
sec_briefcase.contents += new /obj/item/gun/ballistic/revolver/mateba
58+
sec_briefcase.contents += new /obj/item/gun/projectile/energy/crossbow
59+
sec_briefcase.contents += new /obj/item/gun/projectile/ballistic/revolver/mateba
6060
sec_briefcase.contents += new /obj/item/ammo_magazine/a357/speedloader
6161
sec_briefcase.contents += new /obj/item/plastique
6262
H.equip_to_slot_or_del(sec_briefcase, /datum/inventory_slot/abstract/hand/left)

code/datums/outfits/misc.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
head = /obj/item/clothing/head/ushanka
2525
gloves = /obj/item/clothing/gloves/combat
2626
back = /obj/item/storage/backpack/satchel
27-
belt = /obj/item/gun/ballistic/revolver/mateba
27+
belt = /obj/item/gun/projectile/ballistic/revolver/mateba
2828

2929
/datum/outfit/soviet_soldier/admiral
3030
name = "Soviet admiral"

code/datums/outfits/nanotrasen.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
name = "Nanotrasen officer"
2121
head = /obj/item/clothing/head/beret/centcom/officer
2222
l_ear = /obj/item/radio/headset/heads/captain
23-
belt = /obj/item/gun/energy
23+
belt = /obj/item/gun/projectile/energy
2424
id_pda_assignment = "Nanotrasen Officer"
2525

2626
/datum/outfit/nanotrasen/commander
2727
name = "Nanotrasen commander"
2828
uniform = /obj/item/clothing/under/rank/centcom
2929
l_ear = /obj/item/radio/headset/heads/captain
3030
head = /obj/item/clothing/head/beret/centcom/captain
31-
belt = /obj/item/gun/energy
31+
belt = /obj/item/gun/projectile/energy
3232
id_pda_assignment = "Nanotrasen Commander"

code/datums/outfits/outfit.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
l_pocket = /obj/item/ammo_magazine/m95
248248
l_hand = /obj/item/ammo_magazine/m95
249249
r_hand = /obj/item/ammo_magazine/m95
250-
back = /obj/item/gun/ballistic/automatic/battlerifle
250+
back = /obj/item/gun/projectile/ballistic/automatic/battlerifle
251251
backpack_contents = list(/obj/item/storage/box = 1)
252252
abstract_type = /datum/outfit/wizard
253253
head = /obj/item/clothing/head/helmet/combat/JSDF
@@ -268,7 +268,7 @@
268268
shoes = /obj/item/clothing/shoes/boots/jackboots
269269
uniform = /obj/item/clothing/under/oricon/mildress/marine/command
270270
back = /obj/item/storage/backpack/satchel
271-
belt = /obj/item/gun/ballistic/revolver/consul
271+
belt = /obj/item/gun/projectile/ballistic/revolver/consul
272272
l_pocket = /obj/item/ammo_magazine/a44/speedloader
273273
r_pocket = /obj/item/ammo_magazine/a44/speedloader
274274
r_hand = /obj/item/clothing/accessory/holster/hip
@@ -316,7 +316,7 @@
316316
r_pocket = /obj/item/cell/device/weapon
317317
r_hand = /obj/item/melee/transforming/energy/sword/imperial
318318
l_hand = /obj/item/shield/transforming/energy/imperial
319-
suit_store = /obj/item/gun/energy/imperial
319+
suit_store = /obj/item/gun/projectile/energy/imperial
320320

321321
/datum/outfit/imperial/officer
322322
name = "Imperial officer"
@@ -332,4 +332,4 @@
332332
r_pocket = /obj/item/cell/device/weapon
333333
r_hand = /obj/item/melee/transforming/energy/sword/imperial
334334
l_hand = /obj/item/shield/transforming/energy/imperial
335-
suit_store = /obj/item/gun/energy/imperial
335+
suit_store = /obj/item/gun/projectile/energy/imperial

code/datums/outfits/pirates.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
mask = /obj/item/clothing/mask/breath
2727
back = /obj/item/tank/vox
2828
l_hand = /obj/item/melee/transforming/energy/sword/cutlass
29-
r_hand = /obj/item/gun/ballistic/shotgun/pump/rifle/vox_hunting
29+
r_hand = /obj/item/gun/projectile/ballistic/shotgun/pump/rifle/vox_hunting
3030
l_pocket = /obj/item/ammo_magazine/a7_62mm/clip
3131
r_pocket = /obj/item/ammo_magazine/a7_62mm/clip
3232

code/datums/outfits/spec_op.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
77
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
88
head = /obj/item/clothing/head/beret //deathsquad
9-
belt = /obj/item/gun/energy/nt_pulse/carbine
9+
belt = /obj/item/gun/projectile/energy/nt_pulse/carbine
1010
back = /obj/item/storage/backpack/satchel
1111
shoes = /obj/item/clothing/shoes/boots/combat
1212
gloves = /obj/item/clothing/gloves/combat
@@ -30,7 +30,7 @@
3030
shoes = /obj/item/clothing/shoes/boots/swat
3131
gloves = /obj/item/clothing/gloves/swat
3232
l_ear = /obj/item/radio/headset/ert
33-
belt = /obj/item/gun/energy/gun/combat
33+
belt = /obj/item/gun/projectile/energy/gun/combat
3434
glasses = /obj/item/clothing/glasses/sunglasses
3535
back = /obj/item/storage/backpack/satchel
3636

0 commit comments

Comments
 (0)