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

Hunter's Pride #2618

Merged
merged 34 commits into from
Feb 5, 2024
+982 −777
Merged

Hunter's Pride #2618

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
32ba3d5
vickland
rye-rice Dec 24, 2023
040f127
todo: don't update paths until its ready to ship
rye-rice Jan 1, 2024
9e90a73
fuck
rye-rice Jan 2, 2024
29ebb46
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 2, 2024
f55fd1a
apogee_suggestsions/finsihes, todo:illest-saw&enbc
rye-rice Jan 8, 2024
aeeb0b9
request
rye-rice Jan 8, 2024
afccf06
Vickland and Illestren magtype swap req by apogee
rye-rice Jan 10, 2024
4d557eb
polish, fixes some maps
rye-rice Jan 10, 2024
c55bca6
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 10, 2024
2c8def4
fixes maps, probably
rye-rice Jan 10, 2024
eaadd70
woah
rye-rice Jan 10, 2024
70d154f
uifhasdophufdsa damn you ember, hopefully last go
rye-rice Jan 10, 2024
7061fd9
VERY final last time?
rye-rice Jan 10, 2024
dfec359
AAAAAAAAAAAAA
rye-rice Jan 10, 2024
18c1998
how do i keep fucking up oh my god
rye-rice Jan 10, 2024
1c422bb
updated desc/fixes disposable gun runtime
rye-rice Jan 10, 2024
2ab9129
augh
rye-rice Jan 10, 2024
346c95f
apogee suggestions some missed things
rye-rice Jan 12, 2024
09cf75e
this was stupid
rye-rice Jan 12, 2024
9aa3c9f
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 14, 2024
c380e73
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 18, 2024
a2333b8
path fixes
rye-rice Jan 18, 2024
e06c252
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 18, 2024
8701e87
AUGH
rye-rice Jan 19, 2024
06e57fa
sdfgsdfaf
rye-rice Jan 21, 2024
9dd887b
nice catch apoggers
rye-rice Jan 23, 2024
4bd1945
Merge remote-tracking branch 'upstream/master' into re-hp
rye-rice Jan 24, 2024
cfad6ff
woops
rye-rice Jan 25, 2024
a179d7d
fixes inhands/sprites
rye-rice Jan 28, 2024
c8474ca
OOOPS
rye-rice Jan 28, 2024
2824659
test?
rye-rice Jan 29, 2024
2e5f29d
what the fuck?
rye-rice Jan 29, 2024
c8fb452
last shotgun change, i hope
rye-rice Feb 1, 2024
c1a40a7
augh
rye-rice Feb 1, 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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_colony.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
},
/area/overmap_encounter/planetoid/beachplanet/explored)
"NG" = (
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 13
},
/obj/item/toy/plush/carpplushie{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@
/obj/structure/cable/orange{
icon_state = "2-10"
},
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/structure/spacevine,
/turf/open/floor/mineral/plastitanium,
/area/ruin/beach/starwalker)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
"mD" = (
/obj/structure/table/wood,
/obj/machinery/light/small/directional/north,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/turf/open/floor/wood,
/area/ruin/beach)
"mE" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/powered/hydroponicslab)
"oo" = (
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = 2;
pixel_y = -3
},
Expand Down Expand Up @@ -1794,7 +1794,7 @@
/area/ruin/powered/hydroponicslab)
"Mz" = (
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/effect/turf_decal/techfloor{
dir = 4
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@
/obj/item/gun/ballistic/shotgun/automatic/combat{
pixel_y = 5
},
/obj/item/gun/ballistic/revolver/nagant{
/obj/item/gun/ballistic/revolver/montagne{
pixel_y = -1
},
/turf/open/floor/plasteel/tech,
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 @@ -745,7 +745,7 @@
/obj/effect/mob_spawn/human/corpse/assistant{
outfit = /datum/outfit/job/chemist
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_y = -13
},
/turf/open/floor/plating/dirt/jungle/wasteland/lit,
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_pirate.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@
/area/ruin/unpowered)
"Sk" = (
/obj/structure/safe,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/ballistic/shotgun/brimstone,
/obj/item/gun/grenadelauncher,
/turf/open/floor/wood,
/area/ruin/unpowered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_fuckedupandevilclub.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
/obj/structure/table/reinforced,
/obj/item/ammo_casing/shotgun/incendiary,
/obj/item/ammo_casing/shotgun/dragonsbreath,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered)
"OF" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2130,7 +2130,7 @@
pixel_x = 5;
pixel_y = -9
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/ruin/powered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_house.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/area/ruin/unpowered)
"h" = (
/obj/structure/table/wood,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/magazine/m45,
/obj/effect/gibspawner/human/bodypartless,
/obj/item/ammo_box/magazine/m45,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_miningexpedition.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
"TI" = (
/obj/item/chair,
/obj/effect/decal/cleanable/blood,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/plasteel/grimy,
/area/ruin/unpowered)
"Uu" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@
/obj/item/ammo_box/magazine/m45{
pixel_x = 7
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/turf/open/floor/plating/ashplanet/rocky,
/area/ruin/rockplanet/nanotrasen)
"HG" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_saloon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
pixel_x = 4;
pixel_y = 6
},
/obj/item/gun/ballistic/shotgun/riot{
/obj/item/gun/ballistic/shotgun/hellfire{
pixel_x = -10;
pixel_y = 2
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@
/area/overmap_encounter/planetoid/sand/explored)
"Ig" = (
/obj/structure/table,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/concrete,
/area/ruin)
"Io" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@
/area/ruin/whitesands/saloon)
"Oc" = (
/obj/structure/closet/cabinet,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/storage/box/rubbershot{
pixel_x = -5;
pixel_y = 5
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/bigderelict1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/powerstorage)
"bI" = (
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/turf/open/floor/plasteel,
Expand Down Expand Up @@ -1333,7 +1333,7 @@
desc = "A thick gelatinous surface covers the floor. Someone get the golashes.";
name = "gelatinous floor"
},
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/item/ammo_box/magazine/m45,
Expand Down Expand Up @@ -1493,7 +1493,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/derelictoutpost)
"dJ" = (
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
spawnwithmagazine = 0
},
/obj/structure/alien/weeds{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/fueldepot.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/shotgun/lethal,
/obj/item/gun/ballistic/shotgun/brimstone,
/turf/open/floor/mineral/plastitanium,
/area/ruin/unpowered)
"hL" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/lab4071.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,7 +3391,7 @@
pixel_y = -2
},
/obj/item/ammo_box/magazine/m45,
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_x = -3;
pixel_y = 5
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/deprecated/Ruins/whitesands_surface_crash_bar.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
},
/area/whitesands/surface/outdoors)
"lI" = (
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/c45,
/obj/item/ammo_box/magazine/m45,
/obj/structure/table/wood/poker,
Expand Down
8 changes: 4 additions & 4 deletions _maps/deprecated/Ships/minutemen_carina.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2441,9 +2441,9 @@
/obj/structure/sign/minutemen{
pixel_y = 32
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
},
Expand Down Expand Up @@ -2586,7 +2586,7 @@
/obj/item/disk/design_disk/ammo_n762,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762_clip,
/obj/item/gun/ballistic/revolver/nagant,
/obj/item/gun/ballistic/revolver/montagne,
/obj/structure/closet/secure_closet/wall{
dir = 4;
icon_door = "solgov_wall";
Expand Down
2 changes: 0 additions & 2 deletions _maps/deprecated/Ships/nanotrasen_pubby.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,8 +1372,6 @@
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/charcoal,
/obj/item/clothing/under/suit/cargo_tech,
/obj/item/clothing/under/suit/cargo_tech/skirt,
/obj/item/storage/belt/fannypack/black,
/obj/item/storage/belt/fannypack/black,
/obj/item/storage/belt/fannypack/black,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/independent/independent_dwayne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,9 +2105,9 @@
dir = 4
},
/obj/structure/guncase/shotgun,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/turf/open/floor/plasteel,
/area/ship/cargo)
"WE" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/independent/independent_halftrack.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,10 +949,10 @@
dir = 8
},
/obj/structure/rack,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/gun/ballistic/shotgun/hellfire,
/obj/item/gun/ballistic/shotgun/hellfire,
/turf/open/floor/plasteel/dark,
/area/ship/security/armory)
"vT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_nemo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,7 +2178,7 @@
},
/obj/item/firing_pin,
/obj/item/kitchen/knife/hunting,
/obj/item/gun/ballistic/shotgun/contender,
/obj/item/gun/ballistic/shotgun/doublebarrel/beacon,
/obj/item/ammo_box/a4570,
/obj/item/ammo_box/a4570,
/turf/open/floor/carpet/black,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/independent/independent_rigger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,8 +1005,8 @@
pixel_y = 28;
req_access_txt = "1"
},
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/gun/ballistic/automatic/pistol/candor,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"mJ" = (
Expand Down Expand Up @@ -3772,7 +3772,7 @@
/obj/item/clothing/suit/armor/vest/capcarapace/duster,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/cowboy,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/structure/closet/secure_closet/wall{
dir = 8;
icon_state = "solgov_wall";
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_rube_goldberg.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@
/obj/item/rcd_ammo,
/obj/item/rcd_ammo,
/obj/item/clothing/gloves/color/yellow,
/obj/item/gun/ballistic/shotgun/winchester,
/obj/item/gun/ballistic/shotgun/flamingarrow,
/obj/item/ammo_box/c38_box,
/obj/item/storage/fancy/cigarettes/cigars/cohiba,
/obj/effect/turf_decal/corner/opaque/yellow/border{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_tranquility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5490,7 +5490,7 @@
/obj/effect/turf_decal/borderfloorblack{
dir = 5
},
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag{
pixel_x = -2;
pixel_y = 9
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/minutemen/minutemen_asclepius.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4068,7 +4068,7 @@
/obj/item/clothing/head/helmet/bulletproof/minutemen,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/storage/belt/security,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/ammo_box/magazine/m45/rubber,
/obj/item/ammo_box/magazine/m45/rubber{
pixel_x = 3
Expand Down Expand Up @@ -4438,7 +4438,7 @@
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/healthanalyzer/advanced,
/obj/item/clothing/neck/cloak/cmo,
/obj/item/gun/ballistic/revolver/nagant,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/n762_clip,
/obj/item/ammo_box/n762_clip,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
Expand Down
10 changes: 5 additions & 5 deletions _maps/shuttles/minutemen/minutemen_cepheus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/shoes/cowboy/white,
/obj/item/storage/belt/sabre,
/obj/item/gun/ballistic/revolver/nagant,
/obj/item/gun/ballistic/revolver/montagne,
/obj/item/ammo_box/n762_clip,
/obj/item/clothing/suit/armor/vest/capcarapace/minutemen,
/turf/open/floor/plasteel/telecomms_floor,
Expand Down Expand Up @@ -1911,21 +1911,21 @@
dir = 4;
layer = 4.1
},
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
/obj/machinery/light/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_y = 3
},
/obj/structure/sign/poster/contraband/twelve_gauge{
pixel_y = 32
},
/obj/item/gun/ballistic/shotgun/riot,
/obj/item/gun/ballistic/shotgun/hellfire,
/turf/open/floor/plasteel/tech,
/area/ship/security)
"tX" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/minutemen/minutemen_corvus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
dir = 4
},
/obj/structure/extinguisher_cabinet/directional/north,
/obj/item/gun/ballistic/automatic/pistol/m1911{
/obj/item/gun/ballistic/automatic/pistol/candor{
pixel_x = 2;
pixel_y = 5
},
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/flamethrower/full/tank,
/obj/item/gun/ballistic/automatic/smg/cm5,
/turf/open/floor/plasteel/dark,
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/minutemen/minutemen_vela.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@
/obj/item/clothing/suit/toggle/lawyer/minutemen,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/glasses/sunglasses,
/obj/item/gun/ballistic/automatic/pistol/m1911,
/obj/item/gun/ballistic/automatic/pistol/candor,
/obj/item/clothing/head/cowboy/sec/minutemen,
/obj/item/radio/headset/minutemen/alt/captain,
/obj/item/storage/backpack,
Expand Down Expand Up @@ -8319,8 +8319,8 @@
/area/ship/crew/office)
"Th" = (
/obj/structure/guncase,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/pistol/candor/no_mag,
/obj/item/gun/ballistic/automatic/smg/cm5{
spawnwithmagazine = 0
},
Expand Down
Loading
Loading