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

Scarborough Arms #3336

Merged
merged 35 commits into from
Sep 12, 2024
Merged

Scarborough Arms #3336

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
76f233b
gunds
rye-rice Aug 27, 2024
1238931
2
rye-rice Aug 27, 2024
88db9a7
makes file
rye-rice Aug 28, 2024
007ad71
initial
rye-rice Aug 31, 2024
e705409
progress
rye-rice Aug 31, 2024
f27f3be
attachment stuff
rye-rice Sep 3, 2024
315dc8c
more poggers
rye-rice Sep 4, 2024
dda88cb
oughhh, im going to mass repath next before i can fix the toy guns
rye-rice Sep 4, 2024
c9a90d6
PRAYING NO MERGE CONFLICTS
rye-rice Sep 6, 2024
6c389fd
lastminute
rye-rice Sep 6, 2024
9bbf63c
Merge remote-tracking branch 'upstream/master' into scarborgh
rye-rice Sep 6, 2024
d2ba1ef
NO
rye-rice Sep 6, 2024
f97c95a
map checks
rye-rice Sep 6, 2024
95a151b
single typo
rye-rice Sep 6, 2024
cfc06e8
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
rye-rice Sep 6, 2024
99f4439
linters
rye-rice Sep 6, 2024
94b3ee8
WHAT
rye-rice Sep 6, 2024
430c997
fdahjlk
rye-rice Sep 6, 2024
c7b5f99
asshole
rye-rice Sep 6, 2024
ee774f7
mistakes + removes tec 9
rye-rice Sep 6, 2024
5468aaa
compile maps
rye-rice Sep 6, 2024
5e3161b
go away
rye-rice Sep 6, 2024
4252a07
makes frontiermsen drop non-syndicate stuff
rye-rice Sep 7, 2024
c07606a
bugfixes
rye-rice Sep 7, 2024
6d9244c
c
rye-rice Sep 7, 2024
57e49b3
various fixes, linters, and removes the donksoft toy guns
rye-rice Sep 7, 2024
7be7ff6
augh
rye-rice Sep 7, 2024
2e0a58f
l6 saw go away
rye-rice Sep 7, 2024
4f9cbd7
fixes h and and frontiersmen mobs
rye-rice Sep 8, 2024
f14afb1
up/down states for indie viper
rye-rice Sep 8, 2024
51ddcb7
57 box in cargo + guess these are final now
rye-rice Sep 8, 2024
a0e138c
inteq rattlesnake desc
rye-rice Sep 9, 2024
8336aa2
Merge remote-tracking branch 'upstream/master' into scarborgh
rye-rice Sep 9, 2024
97366e7
Merge branch 'master' into scarborgh
rye-rice Sep 10, 2024
9fe7809
Merge branch 'master' into scarborgh
FalloutFalcon Sep 10, 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
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
pixel_x = 6;
pixel_y = -6
},
/obj/item/gun/ballistic/automatic/pistol/syndicate/no_mag{
/obj/item/gun/ballistic/automatic/pistol/ringneck/no_mag{
name = "bible gun";
pixel_x = -7;
pixel_y = -8;
Expand Down Expand Up @@ -3198,8 +3198,8 @@
/obj/structure/closet/wardrobe/chaplain_black{
populate = 0
},
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/structure/spacevine{
name = "vines"
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5613,9 +5613,9 @@
/obj/structure/closet,
/obj/item/clothing/suit/armor/ngr/captain,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
Expand Down Expand Up @@ -5787,9 +5787,9 @@
/area/overmap_encounter/planetoid/jungle/explored)
"Nh" = (
/obj/structure/filingcabinet,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/mineral/plastitanium,
/area/ruin/jungle/starport/tower)
"Nj" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3173,7 +3173,7 @@
/obj/structure/closet/cabinet,
/obj/item/hatchet/wooden,
/obj/item/ammo_box/a357,
/obj/item/gun/ballistic/revolver/syndicate,
/obj/item/gun/ballistic/revolver/viper,
/turf/open/floor/wood,
/area/ship/bridge)
"VM" = (
Expand Down
12 changes: 6 additions & 6 deletions _maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@
"Il" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"Iv" = (
Expand Down Expand Up @@ -1220,8 +1220,8 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/light/small/directional/south,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"My" = (
Expand Down Expand Up @@ -1593,9 +1593,9 @@
/area/ruin/jungle/syndifort)
"WG" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/gun/ballistic/automatic/smg/c20r,
/obj/item/ammo_box/magazine/smgm45,
/obj/item/ammo_box/magazine/smgm45,
/obj/item/gun/ballistic/automatic/smg/cobra,
/obj/item/ammo_box/magazine/m45_cobra,
/obj/item/ammo_box/magazine/m45_cobra,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort/jerry)
"WT" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,10 +1115,10 @@
/turf/open/floor/plating,
/area/ruin/unpowered/listening_post)
"te" = (
/obj/item/gun/ballistic/automatic/smg/c20r{
/obj/item/gun/ballistic/automatic/smg/cobra{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/smgm45{
/obj/item/ammo_box/magazine/m45_cobra{
start_empty = 1
},
/obj/structure/guncloset,
Expand Down Expand Up @@ -2345,8 +2345,8 @@
/area/ruin/unpowered/listening_post)
"TM" = (
/obj/structure/closet/cabinet,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/effect/turf_decal/siding/wood{
dir = 6
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4360,7 +4360,7 @@
/area/ruin/lavaland/factory/adminstrative)
"RC" = (
/obj/effect/turf_decal/siding/white,
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m10mm_ringneck{
start_empty = 1
},
/obj/item/ammo_casing/c10mm{
Expand Down Expand Up @@ -5013,7 +5013,7 @@
/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/effect/decal/cleanable/blood/old,
/obj/effect/turf_decal/siding/white,
/obj/item/ammo_box/magazine/m10mm{
/obj/item/ammo_box/magazine/m10mm_ringneck{
start_empty = 1
},
/turf/open/floor/concrete/pavement/lava,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,12 +587,12 @@
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm_rattlesnake{
pixel_y = 6;
pixel_x = 12;
layer = 3.1
},
/obj/item/ammo_box/magazine/pistolm9mm{
/obj/item/ammo_box/magazine/m9mm_rattlesnake{
pixel_y = 6;
pixel_x = 6;
start_empty = 1;
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
/area/ruin/powered)
"ga" = (
/obj/structure/table/wood/reinforced,
/obj/item/gun/ballistic/automatic/smg/c20r/toy/riot{
/obj/item/gun/ballistic/automatic/smg/cobra/toy/riot{
pixel_x = 5;
pixel_y = 7
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,9 +2000,9 @@
/obj/structure/closet/crate/secure/gear{
req_one_access_txt = "53"
},
/obj/item/ammo_box/magazine/tec9,
/obj/item/ammo_box/magazine/tec9,
/obj/item/gun/ballistic/automatic/pistol/tec9,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/ammo_box/magazine/m9mm_rattlesnake,
/obj/item/storage/pistolcase/ringneck,
/turf/open/floor/plasteel/mono/dark,
/area/ruin/rockplanet/shippingdocksecure)
"rK" = (
Expand Down
10 changes: 3 additions & 7 deletions _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,8 @@
/area/ruin/space/has_grav/corporatemine/crewquarters)
"nN" = (
/obj/structure/closet/cabinet,
/obj/item/gun/ballistic/automatic/pistol/syndicate,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/gun/ballistic/automatic/pistol/ringneck,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/item/clothing/under/syndicate/donk,
/obj/item/clothing/suit/hazardvest/donk/qm,
/obj/item/reagent_containers/food/snacks/donkpocket,
Expand Down Expand Up @@ -2035,10 +2035,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TO" = (
/obj/structure/spawner/burrow/asteroid,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space)
"TR" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
Expand Down Expand Up @@ -2803,7 +2799,7 @@ Al
Al
Al
VM
TO
Iv
Al
Al
Al
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@
dir = 8
},
/obj/item/paper,
/obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/m10mm_ringneck,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6986,8 +6986,8 @@
/area/centcom/evac)
"cIS" = (
/obj/structure/rack,
/obj/item/gun/ballistic/shotgun/bulldog/inteq,
/obj/item/gun/ballistic/shotgun/bulldog/inteq{
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq,
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq{
pixel_x = -5;
pixel_y = -5
},
Expand Down
12 changes: 6 additions & 6 deletions _maps/shuttles/inteq/inteq_talos.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3112,18 +3112,18 @@
/obj/structure/sign/poster/official/ion_carbine{
pixel_x = -32
},
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = 5;
pixel_y = 5
},
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = 5;
pixel_y = 5
},
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = -5
},
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = -5
},
/obj/item/ammo_box/magazine/co9mm{
Expand Down Expand Up @@ -3421,11 +3421,11 @@
/obj/structure/sign/poster/retro/lasergun_new{
pixel_x = -32
},
/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag{
pixel_x = -8;
pixel_y = 8
},
/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag{
pixel_x = -12
},
/turf/open/floor/plasteel/tech/grid,
Expand Down
9 changes: 3 additions & 6 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@
req_access_txt = "3"
},
/obj/machinery/light/small/directional/north,
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = -5;
pixel_y = -5
},
/obj/item/ammo_box/magazine/m12g/small{
/obj/item/ammo_box/magazine/m12g_bulldog{
pixel_x = 5
},
/obj/item/ammo_box/magazine/co9mm{
Expand All @@ -263,10 +263,7 @@
/obj/item/ammo_box/magazine/co9mm{
pixel_x = -5
},
/obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
pixel_x = -4;
pixel_y = 5;
},
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag,
/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
pixel_y = -5
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@
/obj/item/clothing/suit/ngr,
/obj/item/clothing/head/hardhat/ngr/foreman,
/obj/item/tank/jetpack/suit,
/obj/item/storage/pistolcase/stechkin,
/obj/item/storage/pistolcase/ringneck,
/turf/open/floor/carpet/red,
/area/ship/cargo/office)
"BB" = (
Expand Down
Loading
Loading