Skip to content

Commit

Permalink
Merge pull request #4111 from ARF-SS13/SmithFixAgain
Browse files Browse the repository at this point in the history
Fixes the Smithed Lance [READY]
  • Loading branch information
Tk420634 authored Dec 29, 2023
2 parents 83b446e + 237f38e commit 7babf19
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 4 deletions.
45 changes: 41 additions & 4 deletions _maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper-2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,14 @@
color = "#779999"
},
/area/f13/bar/heaven)
"cB" = (
/obj/effect/turf_decal/weather/dirt{
color = "#a98c5d"
},
/turf/open/floor/grass{
color = "#777777"
},
/area/f13/building/tribal)
"cD" = (
/obj/structure/wreck/trash/machinepiletwo{
icon_state = "technical_pile1"
Expand Down Expand Up @@ -6693,6 +6701,15 @@
color = "#6D6D6D"
},
/area/f13/wasteland)
"FH" = (
/obj/effect/turf_decal/weather/dirt{
color = "#a98c5d";
dir = 8
},
/turf/open/floor/grass{
color = "#777777"
},
/area/f13/building/tribal)
"FI" = (
/obj/structure/barricade/sandbags,
/turf/open/indestructible/ground/outside/roof,
Expand Down Expand Up @@ -8695,6 +8712,17 @@
},
/turf/open/indestructible/ground/outside/roof,
/area/f13/wasteland)
"OO" = (
/obj/effect/turf_decal/weather/dirt{
color = "#a98c5d";
dir = 5
},
/obj/effect/turf_decal/weather/dirt{
color = "#a98c5d";
dir = 9
},
/turf/open/transparent/openspace,
/area/f13/building/tribal)
"OQ" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/lootdrop/f13/uncommon,
Expand Down Expand Up @@ -10632,6 +10660,15 @@
icon_state = "darkdirty"
},
/area/f13/wasteland)
"Wy" = (
/obj/effect/turf_decal/weather/dirt{
color = "#a98c5d";
dir = 4
},
/turf/open/floor/grass{
color = "#777777"
},
/area/f13/building/tribal)
"WA" = (
/obj/structure/railing{
dir = 4
Expand Down Expand Up @@ -17050,7 +17087,7 @@ NC
FN
oj
oj
oj
Wy
oj
oj
oj
Expand Down Expand Up @@ -17306,8 +17343,8 @@ hm
NC
oj
oj
oj
oj
cB
OO
YV
oj
LF
Expand Down Expand Up @@ -17564,7 +17601,7 @@ NC
oj
mJ
FN
oj
FH
rz
oj
LF
Expand Down
4 changes: 4 additions & 0 deletions code/modules/smithing/finished_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,10 @@
icon_state = "lance_smith"
icon_prefix = "lance_smith"
overlay_state = "shaft_lance"
force = 28
block_chance = 8
force_wielded = 56
force_unwielded = 28
attack_speed = CLICK_CD_MELEE

/obj/item/melee/smith/twohand/spear/trident
Expand Down

0 comments on commit 7babf19

Please sign in to comment.