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.

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

Adds new mech guns, two new cars (unobtainable), and tidies the mech directory, armor stacks now and uses more gazz, gives hydraulic clams to pickutrucks, adds trunks and seats to crafting menu #222

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
76783e0
Update wardrobes.dm
githubuser4141 May 4, 2024
446a81d
Revert "Update wardrobes.dm"
githubuser4141 May 4, 2024
270f5b3
Equipment V1
githubuser4141 Sep 22, 2024
d1efdf0
V2
githubuser4141 Sep 22, 2024
8e165c5
Update mecha.dm
githubuser4141 Sep 22, 2024
55f3c7e
V3
githubuser4141 Sep 25, 2024
1b52110
V4
githubuser4141 Sep 25, 2024
a7b13f4
Merge branch 'master' of https://github.com/githubuser4141/Hail-Mary
githubuser4141 Sep 25, 2024
091a124
Update mecha.dm
githubuser4141 Sep 25, 2024
df2627a
nope
githubuser4141 Sep 25, 2024
341116b
new line rule
githubuser4141 Sep 25, 2024
f7dfc2c
yes
githubuser4141 Sep 25, 2024
2a9ffc1
Update mecha_topic.dm
githubuser4141 Sep 25, 2024
a8acbd4
Yes
githubuser4141 Sep 25, 2024
843d0ec
Yes
githubuser4141 Sep 26, 2024
1b24755
Yes (2)
githubuser4141 Sep 26, 2024
536442f
fixes
githubuser4141 Sep 26, 2024
9bb7a22
Update armoured.dm
githubuser4141 Sep 26, 2024
c9e5883
Update armoured.dm
githubuser4141 Sep 26, 2024
b89d1d0
Update armoured.dm
githubuser4141 Sep 26, 2024
501ff7c
Mutable
githubuser4141 Sep 26, 2024
8028248
Update mutable_appearance.dm
githubuser4141 Sep 26, 2024
15abe85
Balance
githubuser4141 Sep 26, 2024
0f78dcc
Update phazon.dm
githubuser4141 Sep 26, 2024
23e4467
fuel
githubuser4141 Sep 26, 2024
8b73c24
fuel efficiency
githubuser4141 Sep 27, 2024
06507ca
Uzi - hipower
githubuser4141 Sep 30, 2024
de9d7df
armor utility
githubuser4141 Sep 30, 2024
880b7a0
Test - dnm
githubuser4141 Sep 30, 2024
bd551e7
Revert "armor utility"
githubuser4141 Sep 30, 2024
2cf7874
Revert "Test - dnm"
githubuser4141 Sep 30, 2024
18bd0f3
Armor change
githubuser4141 Sep 30, 2024
0fd6891
typo
githubuser4141 Sep 30, 2024
563f765
V10 - More bombshell mech changes :D
githubuser4141 Oct 1, 2024
ea89506
Armor Changes (Test)
githubuser4141 Oct 1, 2024
2f243ed
Oops
githubuser4141 Oct 1, 2024
5e75ede
New Line Rule
githubuser4141 Oct 1, 2024
5cc6db0
Update buggies.dm
githubuser4141 Oct 1, 2024
2e39343
Update buggies.dm
githubuser4141 Oct 1, 2024
496d979
lol
githubuser4141 Oct 1, 2024
8e54929
Finally
githubuser4141 Oct 1, 2024
324c6cd
Update mecha.dm
githubuser4141 Oct 2, 2024
9d5fa3a
fix?
githubuser4141 Oct 2, 2024
7dc466b
Test, DNM
githubuser4141 Oct 3, 2024
3c9fa28
Update mecha.dm
githubuser4141 Oct 4, 2024
d94691b
Er
githubuser4141 Oct 4, 2024
be26ac7
Update armoured.dm
githubuser4141 Oct 4, 2024
a3d19fa
Balance
githubuser4141 Oct 4, 2024
0092368
Update trucks.dm
githubuser4141 Oct 4, 2024
1686e7c
400
githubuser4141 Oct 4, 2024
bd16821
Merge branch 'master' into master
githubuser4141 Oct 5, 2024
20cd7b1
Update trucks.dm
githubuser4141 Oct 5, 2024
bc97b52
Merge branch 'master' of https://github.com/githubuser4141/Hail-Mary
githubuser4141 Oct 5, 2024
0215c30
Yes
githubuser4141 Oct 5, 2024
9945351
fixes
githubuser4141 Oct 5, 2024
a6348a1
Actual fixes (hopefully)
githubuser4141 Oct 5, 2024
008e13c
Update pickuptrucks.dm
githubuser4141 Oct 5, 2024
980ed2b
Update carriages.dm
githubuser4141 Oct 5, 2024
d75a60d
comments out armored vehicles, adds/changes a few other things
githubuser4141 Oct 6, 2024
07bf90d
misc.
githubuser4141 Oct 6, 2024
ea2aa71
sherman sprites
githubuser4141 Oct 7, 2024
c7dfb2b
Test, do not push, yet
githubuser4141 Oct 7, 2024
8efb2d3
Revert "Test, do not push, yet"
githubuser4141 Oct 10, 2024
5e15ec2
how did I miss that?
githubuser4141 Oct 10, 2024
9790059
fixes
githubuser4141 Oct 14, 2024
fba9939
fix birds (hopefully)
githubuser4141 Oct 14, 2024
e45acb1
New
githubuser4141 Oct 19, 2024
54ac6fc
Update mecha.dm
githubuser4141 Oct 19, 2024
fac37d7
Update Pahrump-AB.dmm
githubuser4141 Oct 19, 2024
034a67d
Merge remote-tracking branch 'upstream/master' into pr/githubuser4141…
githubuser4141 Oct 19, 2024
07d4a53
Update Pahrump-AB.dmm
githubuser4141 Oct 19, 2024
8e43a8c
Merge branch 'master' of https://github.com/githubuser4141/Hail-Mary
githubuser4141 Oct 19, 2024
9a809e6
boom
githubuser4141 Oct 19, 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
24 changes: 12 additions & 12 deletions _maps/map_files/Baltimore/baltimore_surface.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3031,7 +3031,7 @@
/turf/open/floor/plasteel/f13/vault_floor/floor,
/area/f13/raider_mall)
"bch" = (
/obj/mecha/combat/phazon/truckcaravan/loaded{
/obj/mecha/base_vehicle/truckcaravan/loaded{
dir = 8
},
/turf/open/floor/f13/wood,
Expand Down Expand Up @@ -6437,7 +6437,7 @@
name = "red light fixture";
dir = 8
},
/obj/mecha/combat/phazon/buggy/red/loaded,
/obj/mecha/base_vehicle/buggy/red/loaded,
/turf/open/floor/plasteel/f13/vault_floor/plating,
/area/f13/ruins)
"cpw" = (
Expand Down Expand Up @@ -15583,10 +15583,10 @@
/area/f13/ruins)
"fEi" = (
/obj/structure/table/wood/fancy/red,
/obj/mecha/combat/phazon/highwayman/loaded{
/obj/mecha/base_vehicle/highwayman/loaded{
dir = 8
},
/obj/mecha/combat/phazon/highwayman/loaded{
/obj/mecha/base_vehicle/highwayman/loaded{
dir = 8
},
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
Expand Down Expand Up @@ -18294,7 +18294,7 @@
/turf/open/indestructible/ground/outside/gravel,
/area/f13/wasteland/town)
"gzh" = (
/obj/mecha/combat/phazon/pickuptruck/bos/loaded,
/obj/mecha/base_vehicle/pickuptruck/bos/loaded,
/turf/open/floor/f13/wood{
icon_state = "housewood2"
},
Expand Down Expand Up @@ -30226,7 +30226,7 @@
/area/f13/building/boat)
"kNW" = (
/obj/structure/table/wood/fancy,
/obj/mecha/combat/phazon/buggy/red{
/obj/mecha/base_vehicle/buggy/red{
dir = 8
},
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
Expand Down Expand Up @@ -32410,7 +32410,7 @@
},
/area/f13/building/boat)
"lAv" = (
/obj/mecha/combat/phazon/pickuptruck/loaded,
/obj/mecha/base_vehicle/pickuptruck/loaded,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
name = "Old Docks";
sunlight_state = 1
Expand Down Expand Up @@ -39925,7 +39925,7 @@
/turf/open/indestructible/ground/outside/ruins,
/area/f13/wasteland/city/citycenter)
"oiF" = (
/obj/mecha/combat/phazon/corvega/police/loaded{
/obj/mecha/base_vehicle/corvega/police/loaded{
dir = 8
},
/turf/open/indestructible/ground/outside/sidewalkdirt,
Expand Down Expand Up @@ -51224,7 +51224,7 @@
/turf/open/floor/plasteel/f13/vault_floor/plating,
/area/f13/ruins)
"sbK" = (
/obj/mecha/combat/phazon/buggy/loaded,
/obj/mecha/base_vehicle/buggy/loaded,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
name = "Old Docks";
sunlight_state = 1
Expand Down Expand Up @@ -56258,7 +56258,7 @@
/area/f13/wasteland/city/citycenter)
"tRY" = (
/obj/structure/table/wood/fancy,
/obj/mecha/combat/phazon/corvega{
/obj/mecha/base_vehicle/corvega{
dir = 8
},
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{
Expand Down Expand Up @@ -62394,7 +62394,7 @@
/turf/open/floor/plasteel/f13/vault_floor/plating,
/area/f13/clinic)
"vZh" = (
/obj/mecha/combat/phazon/pickuptruck/bos/armed/loaded,
/obj/mecha/base_vehicle/pickuptruck/bos/armed/loaded,
/turf/open/floor/f13/wood{
icon_state = "housewood2"
},
Expand Down Expand Up @@ -63511,7 +63511,7 @@
/turf/closed/wall/f13/sunset/brick_small_dark,
/area/f13/wasteland/city/citycenter)
"wqo" = (
/obj/mecha/combat/phazon/buggy/flamme/loaded,
/obj/mecha/base_vehicle/buggy/flamme/loaded,
/turf/open/floor/plasteel/f13/vault_floor/plating,
/area/f13/ruins)
"wqA" = (
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files/Baltimore/baltimore_upperlevel.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,12 @@
},
/area/f13/building/boat)
"atl" = (
/obj/mecha/combat/phazon/vertibird/enclave/loaded,
/obj/mecha/base_vehicle/vertibird/enclave/loaded,
/obj/effect/turf_decal/delivery,
/turf/open/floor/wood_common/wood_common_light,
/area/f13/wasteland/city)
"atz" = (
/obj/mecha/combat/phazon/buggy/red/loaded,
/obj/mecha/base_vehicle/buggy/red/loaded,
/turf/open/floor/plating/rust{
sunlight_state = 1;
name = "rusted Docks"
Expand Down Expand Up @@ -8692,7 +8692,7 @@
/turf/open/floor/plating/rust,
/area/f13/outpost)
"iaa" = (
/obj/mecha/combat/phazon/vertibird/brotherhood/loaded,
/obj/mecha/base_vehicle/vertibird/brotherhood/loaded,
/turf/open/floor/f13/wood{
icon_state = "housewood2"
},
Expand Down Expand Up @@ -11454,7 +11454,7 @@
},
/area/f13/wasteland/city)
"kHu" = (
/obj/mecha/combat/phazon/vertibird/loaded,
/obj/mecha/base_vehicle/vertibird/loaded,
/turf/open/floor/plasteel/f13/vault_floor/misc/vault1{
name = "Docks";
sunlight_state = 1
Expand Down Expand Up @@ -21224,7 +21224,7 @@
/turf/open/floor/wood_mosaic,
/area/f13/building)
"tSN" = (
/obj/mecha/combat/phazon/buggy/flamme/loaded,
/obj/mecha/base_vehicle/buggy/flamme/loaded,
/turf/open/floor/plating/rust{
sunlight_state = 1;
name = "rusted Docks"
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@
/turf/open/floor/f13/wood,
/area/f13/city)
"cqG" = (
/obj/mecha/combat/phazon/vertibird/ncr/loaded,
/obj/mecha/base_vehicle/vertibird/ncr/loaded,
/turf/open/floor/f13,
/area/f13/ncr)
"cqH" = (
Expand Down Expand Up @@ -3049,7 +3049,7 @@
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/wasteland)
"ewP" = (
/obj/mecha/combat/phazon/vertibird/balloon/loaded,
/obj/mecha/base_vehicle/vertibird/balloon/loaded,
/turf/open/floor/wood_common,
/area/f13/wasteland)
"ext" = (
Expand Down Expand Up @@ -15185,7 +15185,7 @@
/turf/open/floor/wood_fancy,
/area/f13/legion)
"wUp" = (
/obj/mecha/combat/phazon/vertibird/loaded,
/obj/mecha/base_vehicle/vertibird/loaded,
/turf/open/floor/plasteel/airless/white,
/area/f13/wasteland)
"wUx" = (
Expand Down Expand Up @@ -15622,7 +15622,7 @@
},
/area/f13/city)
"xHY" = (
/obj/mecha/combat/phazon/vertibird/brotherhood/loaded,
/obj/mecha/base_vehicle/vertibird/brotherhood/loaded,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/brotherhood/rnd)
"xIn" = (
Expand Down
42 changes: 21 additions & 21 deletions _maps/map_files/Pahrump-AB/Pahrump-AB.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6793,7 +6793,7 @@
/turf/open/floor/plasteel/f13/vault_floor/red/white,
/area/f13/building/mall)
"aBG" = (
/obj/mecha/combat/phazon/ambulance{
/obj/mecha/base_vehicle/ambulance{
dir = 1
},
/turf/open/indestructible/ground/outside/road{
Expand Down Expand Up @@ -15609,7 +15609,7 @@
/obj/effect/decal/marking{
icon_state = "dottedverticalcorroded"
},
/obj/mecha/combat/phazon/buggy/rangerarmed/loaded,
/obj/mecha/base_vehicle/buggy/rangerarmed/loaded,
/turf/open/indestructible/ground/outside/road{
icon_state = "horizontalbottombordertop0"
},
Expand Down Expand Up @@ -19596,7 +19596,7 @@
},
/obj/effect/decal/cleanable/generic,
/obj/effect/decal/cleanable/dirt,
/obj/mecha/combat/phazon/pickuptruck/mechanic{
/obj/mecha/base_vehicle/mechanics_pickuptruck{
dir = 4
},
/turf/open/floor/f13{
Expand Down Expand Up @@ -19781,7 +19781,7 @@
/turf/open/indestructible/ground/outside/desert,
/area/f13/building)
"cpr" = (
/obj/mecha/combat/phazon/pickuptruck/bos/armed,
/obj/mecha/base_vehicle/pickuptruck/bos/armed,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/brotherhood)
"cpy" = (
Expand Down Expand Up @@ -20252,7 +20252,7 @@
},
/area/f13/wasteland)
"ctm" = (
/obj/mecha/combat/phazon/jeep/loaded{
/obj/mecha/base_vehicle/pickuptruck/jeep/loaded{
dir = 8
},
/turf/open/indestructible/ground/outside/dirt{
Expand Down Expand Up @@ -24938,7 +24938,7 @@
/area/f13/wasteland)
"epN" = (
/obj/effect/decal/cleanable/oil,
/obj/mecha/combat/phazon/jeep/bos,
/obj/mecha/base_vehicle/pickuptruck/jeep/bos,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/brotherhood)
"epV" = (
Expand Down Expand Up @@ -29715,7 +29715,7 @@
/area/f13/building)
"gmA" = (
/obj/structure/flora/grass/coyote/one,
/obj/mecha/combat/phazon/buggy/flamme/loaded{
/obj/mecha/base_vehicle/buggy/flamme/loaded{
dir = 8
},
/turf/open/indestructible/ground/inside/mountain,
Expand Down Expand Up @@ -30467,7 +30467,7 @@
/area/f13/legion)
"gBa" = (
/obj/effect/decal/cleanable/dirt,
/obj/mecha/combat/phazon/buggy,
/obj/mecha/base_vehicle/buggy,
/turf/open/indestructible/ground/outside/road{
icon_state = "verticalinnermain1"
},
Expand Down Expand Up @@ -33983,7 +33983,7 @@
},
/area/f13/building/massfusion)
"hYW" = (
/obj/mecha/combat/phazon/buggy/ranger/loaded,
/obj/mecha/base_vehicle/buggy/ranger/loaded,
/turf/open/indestructible/ground/outside/road{
icon_state = "verticalinnermain1"
},
Expand Down Expand Up @@ -39798,7 +39798,7 @@
/turf/open/floor/plating/f13/inside,
/area/f13/caves)
"ksL" = (
/obj/mecha/combat/phazon/buggy/red/loaded{
/obj/mecha/base_vehicle/buggy/red/loaded{
dir = 4
},
/turf/open/indestructible/ground/outside/desert/sonora{
Expand Down Expand Up @@ -51565,7 +51565,7 @@
/area/f13/building/museum)
"pcb" = (
/obj/effect/turf_decal/trimline/white/line,
/obj/mecha/combat/phazon/highwayman/loaded{
/obj/mecha/base_vehicle/highwayman/loaded{
dir = 4
},
/turf/open/indestructible/ground/outside/road{
Expand Down Expand Up @@ -52002,7 +52002,7 @@
/turf/open/indestructible/ground/outside/water,
/area/f13/wasteland)
"plQ" = (
/obj/mecha/combat/phazon/buggy/legion/loaded,
/obj/mecha/base_vehicle/buggy/legion/loaded,
/turf/open/indestructible/ground/outside/desert/sonora{
dir = 4;
icon_state = "desertsmooth4"
Expand Down Expand Up @@ -53630,7 +53630,7 @@
/area/f13/building/hospital)
"pQI" = (
/obj/effect/turf_decal/trimline/white/line,
/obj/mecha/combat/phazon/buggy/dune{
/obj/mecha/base_vehicle/buggy/dune{
dir = 4
},
/turf/open/indestructible/ground/outside/road{
Expand Down Expand Up @@ -56273,7 +56273,7 @@
/area/f13/wasteland)
"qZj" = (
/obj/structure/flora/branch,
/obj/mecha/combat/phazon/buggy/legionarmed/loaded,
/obj/mecha/base_vehicle/buggy/legionarmed/loaded,
/turf/open/indestructible/ground/outside/dirt{
dir = 8;
icon_state = "dirtcorner"
Expand Down Expand Up @@ -60008,7 +60008,7 @@
},
/area/f13/legion)
"sIS" = (
/obj/mecha/combat/phazon/corvega/police/loaded,
/obj/mecha/base_vehicle/corvega/police/loaded,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/city)
"sJn" = (
Expand Down Expand Up @@ -62926,7 +62926,7 @@
"tTf" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
/obj/mecha/combat/phazon/jeep/loaded{
/obj/mecha/base_vehicle/pickuptruck/jeep/loaded{
dir = 8
},
/turf/open/indestructible/ground/outside/road{
Expand Down Expand Up @@ -63075,7 +63075,7 @@
/area/f13/caves)
"tVM" = (
/obj/effect/decal/cleanable/dirt,
/obj/mecha/combat/phazon/ncrtruck/mp/loaded,
/obj/mecha/base_vehicle/ncrtruck/mp/loaded,
/turf/open/indestructible/ground/outside/road{
icon_state = "topshadowleft"
},
Expand Down Expand Up @@ -64653,7 +64653,7 @@
/turf/closed/wall/f13/wood/house,
/area/f13/brotherhood)
"uFF" = (
/obj/mecha/combat/phazon/ambulance{
/obj/mecha/base_vehicle/ambulance{
dir = 4
},
/turf/open/indestructible/ground/outside/sidewalk{
Expand Down Expand Up @@ -66852,7 +66852,7 @@
/obj/effect/decal/cleanable/dirt{
color = "#363636"
},
/obj/mecha/combat/phazon/pickuptruck/mechanic{
/obj/mecha/base_vehicle/mechanics_pickuptruck{
dir = 4
},
/turf/open/floor/f13{
Expand Down Expand Up @@ -70703,7 +70703,7 @@
/turf/open/floor/grass,
/area/f13/wasteland)
"xfe" = (
/obj/mecha/combat/phazon/ncrtruck/loaded,
/obj/mecha/base_vehicle/ncrtruck/loaded,
/turf/open/indestructible/ground/outside/road{
icon_state = "verticalinnermain1"
},
Expand Down Expand Up @@ -72719,7 +72719,7 @@
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"xYD" = (
/obj/mecha/combat/phazon/pickuptruck/bos/loaded,
/obj/mecha/base_vehicle/pickuptruck/bos/loaded,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/brotherhood)
"xYE" = (
Expand Down
Loading
Loading