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

Skrem's Quick Ballistic Glanceover #2354

Merged
merged 3 commits into from
Sep 17, 2023
Merged

Skrem's Quick Ballistic Glanceover #2354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fcad6e
rubber/desc passovers
Skrem7 Sep 15, 2023
e0f472d
fixes some oversights
Skrem7 Sep 15, 2023
dac8644
shotgun speed adjustments
Skrem7 Sep 15, 2023
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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
pixel_x = 9;
pixel_y = -1
},
/obj/item/gun/ballistic/automatic/assualt/p16/minutemen{
/obj/item/gun/ballistic/automatic/assault/p16/minutemen{
pixel_y = 7;
pixel_x = -9
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,7 +1703,7 @@
"Md" = (
/obj/structure/rack,
/obj/item/ammo_box/magazine/smgm9mm/ap,
/obj/item/ammo_box/magazine/smgm9mm/fire,
/obj/item/ammo_box/magazine/smgm9mm/inc,
/obj/machinery/light/small/directional/east,
/turf/open/floor/vault,
/area/ruin/unpowered/corprejectvault)
Expand Down
12 changes: 6 additions & 6 deletions _maps/deprecated/Ships/minutemen_carina.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,12 +2065,12 @@
pixel_x = -1;
pixel_y = 14
},
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/machinery/airalarm/directional/north,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8951,7 +8951,7 @@
"hra" = (
/obj/structure/table/reinforced,
/obj/item/storage/lockbox/loyalty,
/obj/item/gun/ballistic/automatic/assualt/ar,
/obj/item/gun/ballistic/automatic/assault/ar,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/shiptest/independent_beluga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@
req_access_txt = "1"
},
/obj/machinery/light/directional/north,
/obj/item/ammo_box/magazine/co9mm/rubbershot{
/obj/item/ammo_box/magazine/co9mm/rubber{
pixel_x = 9;
pixel_y = 4
},
Expand Down
40 changes: 20 additions & 20 deletions _maps/shuttles/shiptest/independent_halftrack.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,28 +371,28 @@
/obj/item/gun/ballistic/automatic/smg/vector{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/structure/closet/secure_closet/wall{
Expand Down Expand Up @@ -432,11 +432,11 @@
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm/rubber,
/obj/item/ammo_box/magazine/co9mm/rubber,
/obj/item/ammo_box/magazine/co9mm/rubber,
/obj/item/ammo_box/magazine/co9mm/rubber,
/obj/item/ammo_box/magazine/co9mm/rubber,
/obj/effect/turf_decal/box/red,
/turf/open/floor/plasteel/dark,
/area/ship/security)
Expand Down Expand Up @@ -1022,20 +1022,20 @@
/obj/item/gun/ballistic/automatic/smg/vector{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
Expand All @@ -1051,7 +1051,7 @@
req_access_txt = "5"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/machinery/light/directional/north,
Expand Down Expand Up @@ -1502,8 +1502,8 @@
/obj/structure/closet/secure_closet/security,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/pistol/deagle,
/obj/item/gun/ballistic/automatic/assualt/ak47,
/obj/item/gun/ballistic/automatic/assualt/ak47,
/obj/item/gun/ballistic/automatic/assault/ak47,
/obj/item/gun/ballistic/automatic/assault/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47,
/obj/item/ammo_box/magazine/ak47,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/shiptest/independent_litieguai.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,17 +2248,17 @@
/area/ship/crew)
"UX" = (
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
ammo_type = /obj/item/ammo_casing/c9mm/rubbershot;
ammo_type = /obj/item/ammo_casing/c9mm/rubber;
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/item/ammo_box/magazine/co9mm{
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/shiptest/independent_rigger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4144,8 +4144,8 @@
req_access_txt = "1"
},
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45,
/turf/open/floor/plasteel/dark,
/area/ship/security)
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/shiptest/independent_tranquility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5481,7 +5481,7 @@
/area/ship/engineering/engine)
"Rk" = (
/obj/structure/table,
/obj/item/ammo_box/magazine/m45/rubbershot{
/obj/item/ammo_box/magazine/m45/rubber{
pixel_x = 7;
pixel_y = -2
},
Expand Down Expand Up @@ -5644,15 +5644,15 @@
/area/ship/hallway/starboard)
"Sg" = (
/obj/structure/table,
/obj/item/ammo_casing/c45/rubbershot{
/obj/item/ammo_casing/c45/rubber{
pixel_x = 6;
pixel_y = 7
},
/obj/item/ammo_casing/c45/rubbershot{
/obj/item/ammo_casing/c45/rubber{
pixel_x = 4;
pixel_y = 5
},
/obj/item/ammo_casing/c45/rubbershot{
/obj/item/ammo_casing/c45/rubber{
pixel_x = 8;
pixel_y = 3
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/shiptest/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
/obj/item/ammo_box/magazine/ak47{
pixel_x = 7
},
/obj/item/gun/ballistic/automatic/assualt/ak47/inteq{
/obj/item/gun/ballistic/automatic/assault/ak47/inteq{
pixel_x = -5
},
/obj/structure/closet/secure_closet/wall{
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/shiptest/minutemen_asclepius.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4069,8 +4069,8 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/storage/belt/security,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot{
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber{
pixel_x = 3
},
/obj/structure/railing{
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/shiptest/minutemen_corvus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,18 +2327,18 @@
/obj/item/ammo_box/magazine/m45{
pixel_x = 5
},
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/effect/turf_decal/corner/opaque/red/border{
dir = 1
},
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/smgm9mm{
pixel_x = 2;
pixel_y = 1
},
/obj/item/ammo_box/magazine/smgm9mm/rubbershot{
/obj/item/ammo_box/magazine/smgm9mm/rubber{
pixel_x = -5;
pixel_y = -2
},
Expand Down
14 changes: 7 additions & 7 deletions _maps/shuttles/shiptest/minutemen_vela.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/m45,
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubbershot,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/magazine/smgm9mm/rubber,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/structure/cable{
icon_state = "0-6"
Expand Down Expand Up @@ -3056,8 +3056,8 @@
/obj/item/clothing/head/helmet/bulletproof/minutemen,
/obj/item/storage/belt/security/full,
/obj/item/restraints/handcuffs,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/item/clothing/suit/armor/vest/marine,
Expand Down Expand Up @@ -6266,8 +6266,8 @@
/obj/item/clothing/head/helmet/bulletproof/minutemen,
/obj/item/storage/belt/security/full,
/obj/item/restraints/handcuffs,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubbershot,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/structure/sign/poster/official/focus{
pixel_y = 32
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
name = "WT-550 Auto Rifle Exotic Ammo Crate"
desc = "Contains one magazine of armor-piercing and one magazine of incendiary ammunition for the WT-550 Auto Rifle. Sadly, our manufacturer discontinued the uranium-tipped bullets."
cost = 2500
contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap,
/obj/item/ammo_box/magazine/wt550m9/wtic)
contains = list(/obj/item/ammo_box/magazine/wt550m9/ap,
/obj/item/ammo_box/magazine/wt550m9/inc)

/*
Rifle ammo
Expand Down
8 changes: 4 additions & 4 deletions code/modules/cargo/packs/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,16 @@
name = "P16 Assault Rifle Crate"
desc = "Contains two high-powered, automatic rifles chambered in 5.56mm."
cost = 8000
contains = list(/obj/item/gun/ballistic/automatic/assualt/p16,
/obj/item/gun/ballistic/automatic/assualt/p16)
contains = list(/obj/item/gun/ballistic/automatic/assault/p16,
/obj/item/gun/ballistic/automatic/assault/p16)
crate_name = "auto rifle crate"

/datum/supply_pack/gun/ak
name = "SVG-67 Rifle Crate"
desc = "Contains two high-powered, automatic rifles chambered in 7.62x39mm."
cost = 6000
contains = list(/obj/item/gun/ballistic/automatic/assualt/ak47,
/obj/item/gun/ballistic/automatic/assualt/ak47)
contains = list(/obj/item/gun/ballistic/automatic/assault/ak47,
/obj/item/gun/ballistic/automatic/assault/ak47)
crate_name = "auto rifle crate"

/*
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@

/obj/item/clothing/suit/armor/vest/bulletproof/solgov/Initialize()
. = ..()
allowed |= list(/obj/item/gun/ballistic/automatic/assualt/swiss_cheese, /obj/item/tank)
allowed |= list(/obj/item/gun/ballistic/automatic/assault/swiss_cheese, /obj/item/tank)

/obj/item/clothing/suit/armor/vest/hop
name = "head of personnel's parade jacket"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/security_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S
/datum/outfit/job/security/minutemen/armed
name = "Minuteman (Colonial Minutemen) (Armed)"

suit_store = /obj/item/gun/ballistic/automatic/assualt/p16/minutemen
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
belt = /obj/item/storage/belt/military/minutemen/loaded

/datum/outfit/job/security/minutemen/mechpilot
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
/datum/outfit/job/warden/minutemen/armed
name = "Field Commander (Colonial Minutemen) (Armed)"

suit_store = /obj/item/gun/ballistic/automatic/assualt/p16/minutemen
suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen
belt = /obj/item/storage/belt/military/minutemen/loaded

backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/simple_animal/hostile/frontiersman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
retreat_distance = 5
minimum_distance = 5
projectilesound = 'sound/weapons/gun/revolver/shot.ogg'
casingtype = /obj/item/ammo_casing/n762
casingtype = /obj/item/ammo_casing/n762_38


/mob/living/simple_animal/hostile/frontier/ranged/mosin
icon_state = "frontiersmanrangedrifle"
icon_living = "frontiersmanrangedrifle"
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged,
/obj/item/gun/ballistic/rifle/boltaction)
casingtype = /obj/item/ammo_casing/a762
casingtype = /obj/item/ammo_casing/a762_54
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/frontier/ranged/trooper
Expand All @@ -68,15 +68,15 @@
rapid_fire_delay = 3
casingtype = /obj/item/ammo_casing/a762_39
loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/automatic/assualt/ak47)
/obj/item/gun/ballistic/automatic/assault/ak47)

/mob/living/simple_animal/hostile/frontier/ranged/trooper/rifle
icon_state = "frontiersmanrangedmosin"
icon_living = "frontiersmanrangedmosin"

loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper,
/obj/item/gun/ballistic/rifle/boltaction)
casingtype = /obj/item/ammo_casing/a762
casingtype = /obj/item/ammo_casing/a762_54
projectilesound = 'sound/weapons/gun/rifle/mosin.ogg'

/mob/living/simple_animal/hostile/frontier/ranged/trooper/heavy
Expand Down
Loading