Skip to content

Commit 9ecba78

Browse files
NPC1314NPC1314
authored
Merge branch 'main' into Doublebed_fix
2 parents 959af71 + ec654b0 commit 9ecba78

File tree

54 files changed

+3466
-3064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3466
-3064
lines changed

‎_maps/custom/roguehamlet.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6042,7 +6042,7 @@
60426042
/area/rogue/outdoors/mountains)
60436043
"gqM" = (
60446044
/obj/structure/chair/stool/rogue,
6045-
/obj/effect/landmark/start/grabber{
6045+
/obj/effect/landmark/start/stevedore{
60466046
dir = 8
60476047
},
60486048
/turf/open/floor/rogue/twig,
@@ -19301,7 +19301,7 @@
1930119301
/area/rogue)
1930219302
"tWr" = (
1930319303
/obj/structure/chair/stool/rogue,
19304-
/obj/effect/landmark/start/grabber,
19304+
/obj/effect/landmark/start/stevedore,
1930519305
/turf/open/floor/rogue/twig,
1930619306
/area/rogue/indoors/town/shop)
1930719307
"tWT" = (
@@ -21424,7 +21424,7 @@
2142421424
dir = 8;
2142521425
icon_state = "chair2"
2142621426
},
21427-
/obj/effect/landmark/start/barkeep{
21427+
/obj/effect/landmark/start/innkeep{
2142821428
dir = 8
2142921429
},
2143021430
/turf/open/floor/rogue/wood/nosmooth,

‎_maps/custom/roguetown.dmm

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7661,15 +7661,11 @@
76617661
},
76627662
/area/rogue/indoors/town/shop)
76637663
"BQ" = (
7664-
/obj/effect/landmark/start/grabber{
7665-
name = "Hauler"
7666-
},
7664+
/obj/effect/landmark/start/stevedore,
76677665
/turf/open/floor/rogue/ruinedwood,
76687666
/area/rogue/indoors/town)
76697667
"BR" = (
7670-
/obj/effect/landmark/start/grabber{
7671-
name = "Hauler"
7672-
},
7668+
/obj/effect/landmark/start/stevedore,
76737669
/turf/open/floor/rogue/blocks/bluestone,
76747670
/area/rogue/indoors/town)
76757671
"BS" = (
@@ -13402,7 +13398,7 @@
1340213398
},
1340313399
/area/rogue/indoors/town)
1340413400
"YH" = (
13405-
/obj/effect/landmark/start/barkeep,
13401+
/obj/effect/landmark/start/innkeep,
1340613402
/turf/open/floor/rogue/ruinedwood,
1340713403
/area/rogue/indoors/town/tavern)
1340813404
"YI" = (

‎_maps/custom/stonekeep.dmm

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7661,15 +7661,11 @@
76617661
},
76627662
/area/rogue/indoors/town/shop)
76637663
"BQ" = (
7664-
/obj/effect/landmark/start/grabber{
7665-
name = "Hauler"
7666-
},
7664+
/obj/effect/landmark/start/stevedore,
76677665
/turf/open/floor/rogue/ruinedwood,
76687666
/area/rogue/indoors/town)
76697667
"BR" = (
7670-
/obj/effect/landmark/start/grabber{
7671-
name = "Hauler"
7672-
},
7668+
/obj/effect/landmark/start/stevedore,
76737669
/turf/open/floor/rogue/blocks/bluestone,
76747670
/area/rogue/indoors/town)
76757671
"BS" = (
@@ -13402,7 +13398,7 @@
1340213398
},
1340313399
/area/rogue/indoors/town)
1340413400
"YH" = (
13405-
/obj/effect/landmark/start/barkeep,
13401+
/obj/effect/landmark/start/innkeep,
1340613402
/turf/open/floor/rogue/ruinedwood,
1340713403
/area/rogue/indoors/town/tavern)
1340813404
"YI" = (

‎_maps/map_files/dakkatown/dakkatown.dmm

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -783,9 +783,6 @@
783783
/area/rogue/under/town/basement)
784784
"cY" = (
785785
/obj/structure/chair/stool/rogue,
786-
/obj/effect/landmark/start/grabber{
787-
dir = 8
788-
},
789786
/turf/open/floor/rogue/ruinedwood/turned,
790787
/area/rogue/indoors/town)
791788
"cZ" = (
@@ -2409,7 +2406,7 @@
24092406
/turf/open/floor/rogue/cobble/mossy,
24102407
/area/rogue/under/town/sewer)
24112408
"jf" = (
2412-
/obj/effect/landmark/start/barkeep{
2409+
/obj/effect/landmark/start/innkeep{
24132410
dir = 1
24142411
},
24152412
/turf/open/floor/rogue/ruinedwood/spiral,
@@ -5882,9 +5879,6 @@
58825879
/area/rogue/outdoors/river)
58835880
"ww" = (
58845881
/obj/structure/chair/stool/rogue,
5885-
/obj/effect/landmark/start/grabber{
5886-
dir = 4
5887-
},
58885882
/turf/open/floor/rogue/ruinedwood/turned,
58895883
/area/rogue/indoors/town)
58905884
"wx" = (
@@ -9563,7 +9557,6 @@
95639557
/area/rogue/outdoors/exposed/manorgarri)
95649558
"Kt" = (
95659559
/obj/structure/chair/stool/rogue,
9566-
/obj/effect/landmark/start/grabber,
95679560
/turf/open/floor/rogue/wood,
95689561
/area/rogue/indoors/town/tavern)
95699562
"Ku" = (

‎_maps/map_files/dakkatown/otherz/dakkacoast.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
/area/rogue/outdoors/beach)
5757
"dZ" = (
5858
/obj/structure/bed/rogue/shit,
59-
/obj/effect/landmark/start/grabber{
59+
/obj/effect/landmark/start/stevedore{
6060
dir = 8
6161
},
6262
/turf/open/floor/rogue/twig,
@@ -230,7 +230,7 @@
230230
/area/rogue/outdoors/beach/boat)
231231
"AZ" = (
232232
/obj/structure/chair/stool/rogue,
233-
/obj/effect/landmark/start/grabber{
233+
/obj/effect/landmark/start/stevedore{
234234
dir = 4
235235
},
236236
/turf/open/floor/rogue/twig,

‎_maps/map_files/dun_manor/dun_manor.dmm

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,10 +4529,6 @@
45294529
/obj/effect/decal/turfedge_neu{
45304530
dir = 9
45314531
},
4532-
/obj/effect/landmark/start/grabber{
4533-
dir = 4;
4534-
name = "Stevedore"
4535-
},
45364532
/turf/open/floor/rogue/twig,
45374533
/area/rogue/indoors/town)
45384534
"epe" = (
@@ -20758,9 +20754,6 @@
2075820754
/area/rogue/indoors/town)
2075920755
"upc" = (
2076020756
/obj/structure/bed/rogue/hay,
20761-
/obj/effect/landmark/start/grabber{
20762-
name = "Stevedore"
20763-
},
2076420757
/turf/open/floor/rogue/twig,
2076520758
/area/rogue/indoors/town)
2076620759
"upl" = (
@@ -24147,7 +24140,7 @@
2414724140
/turf/open/floor/rogue/wood,
2414824141
/area/rogue/indoors/town/magician)
2414924142
"xHq" = (
24150-
/obj/effect/landmark/start/barkeep{
24143+
/obj/effect/landmark/start/innkeep{
2415124144
dir = 4
2415224145
},
2415324146
/turf/open/floor/rogue/ruinedwood,

‎_maps/map_files/old_maps/roguetown2.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5936,7 +5936,7 @@
59365936
/turf/open/floor/rogue/ruinedwood,
59375937
/area/rogue/indoors/town/tavern)
59385938
"tW" = (
5939-
/obj/effect/landmark/start/barkeep,
5939+
/obj/effect/landmark/start/innkeep,
59405940
/turf/open/floor/rogue/ruinedwood,
59415941
/area/rogue/indoors/town/tavern)
59425942
"tX" = (

‎_maps/map_files/old_maps/roguetown3.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4912,7 +4912,7 @@
49124912
/turf/open/floor/rogue/wood,
49134913
/area/rogue)
49144914
"apu" = (
4915-
/obj/effect/landmark/start/barkeep,
4915+
/obj/effect/landmark/start/innkeep,
49164916
/turf/open/floor/rogue/woodturned,
49174917
/area/rogue)
49184918
"apv" = (

‎_maps/map_files/old_maps/roguetown4.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5418,7 +5418,7 @@
54185418
/turf/open/floor/rogue/cobble,
54195419
/area/rogue/under/town/basement)
54205420
"tS" = (
5421-
/obj/effect/landmark/start/barkeep,
5421+
/obj/effect/landmark/start/innkeep,
54225422
/turf/open/floor/rogue/ruinedwood,
54235423
/area/rogue/indoors/town/tavern)
54245424
"tT" = (

‎_maps/map_files/roguetown/otherz/roguehamlet.dmm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5753,7 +5753,7 @@
57535753
/area/rogue/outdoors/mountains)
57545754
"gqM" = (
57555755
/obj/structure/chair/stool/rogue,
5756-
/obj/effect/landmark/start/grabber{
5756+
/obj/effect/landmark/start/stevedore{
57575757
dir = 8
57585758
},
57595759
/turf/open/floor/rogue/twig,
@@ -18798,7 +18798,7 @@
1879818798
/area/rogue)
1879918799
"tWr" = (
1880018800
/obj/structure/chair/stool/rogue,
18801-
/obj/effect/landmark/start/grabber,
18801+
/obj/effect/landmark/start/stevedore,
1880218802
/turf/open/floor/rogue/twig,
1880318803
/area/rogue/indoors/town/shop)
1880418804
"tWT" = (
@@ -20808,7 +20808,7 @@
2080820808
icon_state = "chair2";
2080920809
dir = 8
2081020810
},
20811-
/obj/effect/landmark/start/barkeep{
20811+
/obj/effect/landmark/start/innkeep{
2081220812
dir = 8
2081320813
},
2081420814
/turf/open/floor/rogue/wood/nosmooth,

‎_maps/map_files/roguetown/roguetown.dmm

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,9 +1221,6 @@
12211221
/turf/open/floor/rogue/woodturned,
12221222
/area/rogue/indoors/town)
12231223
"bst" = (
1224-
/obj/effect/landmark/start/grabber{
1225-
name = "Hauler"
1226-
},
12271224
/turf/open/floor/rogue/ruinedwood,
12281225
/area/rogue/indoors/town)
12291226
"btq" = (
@@ -3391,7 +3388,7 @@
33913388
},
33923389
/obj/structure/bed/rogue/inn,
33933390
/obj/item/bedsheet/rogue/fabric,
3394-
/obj/effect/landmark/start/barkeep,
3391+
/obj/effect/landmark/start/innkeep,
33953392
/turf/open/floor/rogue/carpet/green,
33963393
/area/rogue/under/town/basement)
33973394
"dGM" = (
@@ -4229,9 +4226,6 @@
42294226
},
42304227
/area/rogue/indoors)
42314228
"eAq" = (
4232-
/obj/effect/landmark/start/grabber{
4233-
name = "Hauler"
4234-
},
42354229
/turf/open/floor/rogue/blocks/bluestone,
42364230
/area/rogue/indoors/town)
42374231
"eAU" = (

‎_maps/map_files/rogueworld/roguetown.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8340,7 +8340,7 @@
83408340
/turf/open/floor/rogue/ruinedwood,
83418341
/area/rogue/indoors/town/tavern)
83428342
"Cw" = (
8343-
/obj/effect/landmark/start/barkeep,
8343+
/obj/effect/landmark/start/innkeep,
83448344
/turf/open/floor/rogue/ruinedwood,
83458345
/area/rogue/indoors/town/tavern)
83468346
"Cx" = (

0 commit comments

Comments
 (0)