Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 869d810

Browse files
ToasterBiomeToasterBiome
committed
Merge remote-tracking branch 'upstream/master'
2 parents ca22881 + 3a611d6 commit 869d810

File tree

707 files changed

+200977
-688015
lines changed

Some content is hidden

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

707 files changed

+200977
-688015
lines changed

‎_maps/RandomRuins/LavaRuins/lavaland_biodome_fishing.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@
20352035
/obj/item/stack/sheet/mineral/bamboo{
20362036
amount = 50
20372037
},
2038-
/obj/item/paicard,
2038+
/obj/item/computer_hardware/paicard,
20392039
/obj/item/reagent_containers/glass/gromitmug,
20402040
/turf/open/floor/plasteel/dark,
20412041
/area/ruin/powered/fishing/shop)

‎_maps/RandomRuins/LavaRuins/lavaland_surface_cafe_of_broken_dreams.dmm‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@
105105
/obj/machinery/light/small,
106106
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
107107
/area/ruin/powered)
108-
"aT" = (
109-
/obj/structure/table/wood/bar,
110-
/obj/item/pda/chameleon,
111-
/turf/open/floor/wood,
112-
/area/ruin/powered)
113108
"aU" = (
114109
/obj/structure/grille,
115110
/obj/structure/window/reinforced/fulltile,
@@ -121,7 +116,6 @@
121116
/obj/structure/sink{
122117
desc = "Clean off your radiation.";
123118
dir = 8;
124-
icon_state = "sink";
125119
pixel_x = -12;
126120
pixel_y = 2
127121
},
@@ -187,8 +181,7 @@
187181
/area/ruin/powered)
188182
"bi" = (
189183
/obj/machinery/light{
190-
dir = 8;
191-
icon_state = "tube"
184+
dir = 8
192185
},
193186
/turf/open/floor/wood,
194187
/area/ruin/powered)
@@ -243,8 +236,7 @@
243236
/area/ruin/powered)
244237
"bv" = (
245238
/obj/structure/chair/comfy/beige{
246-
dir = 4;
247-
icon_state = "comfychair"
239+
dir = 4
248240
},
249241
/turf/open/floor/wood,
250242
/area/ruin/powered)
@@ -264,8 +256,7 @@
264256
/area/ruin/powered)
265257
"bz" = (
266258
/obj/structure/chair/comfy/beige{
267-
dir = 1;
268-
icon_state = "comfychair"
259+
dir = 1
269260
},
270261
/turf/open/floor/wood,
271262
/area/ruin/powered)
@@ -274,8 +265,7 @@
274265
dir = 4
275266
},
276267
/obj/machinery/light{
277-
dir = 8;
278-
icon_state = "tube"
268+
dir = 8
279269
},
280270
/turf/open/floor/wood,
281271
/area/ruin/powered)
@@ -286,8 +276,7 @@
286276
/area/ruin/powered)
287277
"bE" = (
288278
/obj/machinery/light{
289-
dir = 4;
290-
icon_state = "tube"
279+
dir = 4
291280
},
292281
/turf/open/floor/wood{
293282
icon_state = "wood-broken4"
@@ -322,8 +311,7 @@
322311
"bR" = (
323312
/obj/structure/table/wood,
324313
/obj/machinery/light{
325-
dir = 8;
326-
icon_state = "tube"
314+
dir = 8
327315
},
328316
/turf/open/floor/wood,
329317
/area/ruin/powered)
@@ -427,8 +415,7 @@
427415
/area/ruin/powered)
428416
"zW" = (
429417
/obj/machinery/light{
430-
dir = 1;
431-
icon_state = "tube"
418+
dir = 1
432419
},
433420
/turf/open/floor/wood,
434421
/area/ruin/powered)
@@ -2681,7 +2668,7 @@ ai
26812668
bj
26822669
ai
26832670
ai
2684-
aT
2671+
aw
26852672
ai
26862673
ai
26872674
ai

‎_maps/RandomRuins/LavaRuins/lavaland_surface_clownfacility.dmm‎

Lines changed: 31 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
/area/ruin/unpowered)
5050
"al" = (
5151
/obj/structure/chair/bananium{
52-
dir = 8;
53-
icon_state = "bananium_chair"
52+
dir = 8
5453
},
5554
/turf/open/floor/mineral/bananium,
5655
/area/ruin/unpowered)
@@ -62,20 +61,16 @@
6261
/obj/item/clothing/gloves/color/rainbow,
6362
/obj/item/clothing/mask/gas/clown_hat,
6463
/obj/item/clothing/shoes/clown_shoes,
65-
/obj/item/clothing/under/rank/clown,
6664
/obj/item/storage/backpack/clown,
6765
/obj/item/storage/backpack/duffelbag/clown,
68-
/obj/item/cartridge/virus/clown,
6966
/turf/open/floor/mineral/bananium,
7067
/area/ruin/unpowered)
7168
"ao" = (
7269
/obj/machinery/door/airlock/bananium,
7370
/turf/open/floor/mineral/bananium,
7471
/area/ruin/unpowered)
7572
"ap" = (
76-
/obj/structure/bed{
77-
pixel_y = 0
78-
},
73+
/obj/structure/bed,
7974
/obj/item/bedsheet/clown,
8075
/turf/open/floor/mineral/bananium,
8176
/area/ruin/unpowered)
@@ -350,16 +345,13 @@
350345
"bl" = (
351346
/obj/effect/turf_decal/tile/red,
352347
/obj/effect/turf_decal/tile/red{
353-
dir = 4;
354-
icon_state = "tile_corner"
348+
dir = 4
355349
},
356350
/obj/effect/turf_decal/tile/red{
357-
dir = 1;
358-
icon_state = "tile_corner"
351+
dir = 1
359352
},
360353
/obj/effect/turf_decal/tile/red{
361-
dir = 8;
362-
icon_state = "tile_corner"
354+
dir = 8
363355
},
364356
/turf/open/floor/plasteel/dark,
365357
/area/ruin/unpowered)
@@ -391,24 +383,20 @@
391383
},
392384
/obj/effect/turf_decal/tile/red,
393385
/obj/effect/turf_decal/tile/red{
394-
dir = 4;
395-
icon_state = "tile_corner"
386+
dir = 4
396387
},
397388
/obj/effect/turf_decal/tile/red{
398-
dir = 1;
399-
icon_state = "tile_corner"
389+
dir = 1
400390
},
401391
/obj/effect/turf_decal/tile/red{
402-
dir = 8;
403-
icon_state = "tile_corner"
392+
dir = 8
404393
},
405394
/turf/open/floor/plasteel/dark,
406395
/area/ruin/unpowered)
407396
"br" = (
408397
/obj/item/grown/bananapeel,
409398
/obj/effect/turf_decal/stripes/line{
410-
dir = 8;
411-
icon_state = "warningline"
399+
dir = 8
412400
},
413401
/turf/open/floor/plasteel/dark{
414402
dir = 8
@@ -418,16 +406,13 @@
418406
/obj/effect/decal/cleanable/oil/streak,
419407
/obj/effect/turf_decal/tile/red,
420408
/obj/effect/turf_decal/tile/red{
421-
dir = 4;
422-
icon_state = "tile_corner"
409+
dir = 4
423410
},
424411
/obj/effect/turf_decal/tile/red{
425-
dir = 1;
426-
icon_state = "tile_corner"
412+
dir = 1
427413
},
428414
/obj/effect/turf_decal/tile/red{
429-
dir = 8;
430-
icon_state = "tile_corner"
415+
dir = 8
431416
},
432417
/turf/open/floor/plasteel/dark,
433418
/area/ruin/unpowered)
@@ -448,40 +433,33 @@
448433
/obj/item/paperplane,
449434
/obj/effect/turf_decal/tile/red,
450435
/obj/effect/turf_decal/tile/red{
451-
dir = 4;
452-
icon_state = "tile_corner"
436+
dir = 4
453437
},
454438
/obj/effect/turf_decal/tile/red{
455-
dir = 1;
456-
icon_state = "tile_corner"
439+
dir = 1
457440
},
458441
/obj/effect/turf_decal/tile/red{
459-
dir = 8;
460-
icon_state = "tile_corner"
442+
dir = 8
461443
},
462444
/turf/open/floor/plasteel/dark,
463445
/area/ruin/unpowered)
464446
"bw" = (
465447
/obj/item/coin/bananium,
466448
/obj/effect/turf_decal/tile/red,
467449
/obj/effect/turf_decal/tile/red{
468-
dir = 4;
469-
icon_state = "tile_corner"
450+
dir = 4
470451
},
471452
/obj/effect/turf_decal/tile/red{
472-
dir = 1;
473-
icon_state = "tile_corner"
453+
dir = 1
474454
},
475455
/obj/effect/turf_decal/tile/red{
476-
dir = 8;
477-
icon_state = "tile_corner"
456+
dir = 8
478457
},
479458
/turf/open/floor/plasteel/dark,
480459
/area/ruin/unpowered)
481460
"bx" = (
482461
/obj/effect/turf_decal/stripes/line{
483-
dir = 8;
484-
icon_state = "warningline"
462+
dir = 8
485463
},
486464
/turf/open/floor/plasteel/dark{
487465
dir = 8
@@ -493,16 +471,13 @@
493471
/obj/item/pickaxe/drill,
494472
/obj/effect/turf_decal/tile/red,
495473
/obj/effect/turf_decal/tile/red{
496-
dir = 4;
497-
icon_state = "tile_corner"
474+
dir = 4
498475
},
499476
/obj/effect/turf_decal/tile/red{
500-
dir = 1;
501-
icon_state = "tile_corner"
477+
dir = 1
502478
},
503479
/obj/effect/turf_decal/tile/red{
504-
dir = 8;
505-
icon_state = "tile_corner"
480+
dir = 8
506481
},
507482
/turf/open/floor/plasteel/dark,
508483
/area/ruin/unpowered)
@@ -523,50 +498,41 @@
523498
/obj/structure/mecha_wreckage/honker,
524499
/obj/effect/turf_decal/tile/red,
525500
/obj/effect/turf_decal/tile/red{
526-
dir = 4;
527-
icon_state = "tile_corner"
501+
dir = 4
528502
},
529503
/obj/effect/turf_decal/tile/red{
530-
dir = 1;
531-
icon_state = "tile_corner"
504+
dir = 1
532505
},
533506
/obj/effect/turf_decal/tile/red{
534-
dir = 8;
535-
icon_state = "tile_corner"
507+
dir = 8
536508
},
537509
/turf/open/floor/plasteel/dark,
538510
/area/ruin/unpowered)
539511
"bD" = (
540512
/obj/effect/decal/cleanable/robot_debris,
541513
/obj/effect/turf_decal/tile/red,
542514
/obj/effect/turf_decal/tile/red{
543-
dir = 4;
544-
icon_state = "tile_corner"
515+
dir = 4
545516
},
546517
/obj/effect/turf_decal/tile/red{
547-
dir = 1;
548-
icon_state = "tile_corner"
518+
dir = 1
549519
},
550520
/obj/effect/turf_decal/tile/red{
551-
dir = 8;
552-
icon_state = "tile_corner"
521+
dir = 8
553522
},
554523
/turf/open/floor/plasteel/dark,
555524
/area/ruin/unpowered)
556525
"bE" = (
557526
/obj/effect/decal/cleanable/shreds,
558527
/obj/effect/turf_decal/tile/red,
559528
/obj/effect/turf_decal/tile/red{
560-
dir = 4;
561-
icon_state = "tile_corner"
529+
dir = 4
562530
},
563531
/obj/effect/turf_decal/tile/red{
564-
dir = 1;
565-
icon_state = "tile_corner"
532+
dir = 1
566533
},
567534
/obj/effect/turf_decal/tile/red{
568-
dir = 8;
569-
icon_state = "tile_corner"
535+
dir = 8
570536
},
571537
/turf/open/floor/plasteel/dark,
572538
/area/ruin/unpowered)

‎_maps/RandomRuins/SpaceRuins/TheDerelict.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@
14211421
/area/ruin/space/derelict/bridge/access)
14221422
"eC" = (
14231423
/obj/structure/table,
1424-
/obj/item/paicard,
1424+
/obj/item/computer_hardware/paicard,
14251425
/turf/open/floor/plasteel,
14261426
/area/ruin/space/derelict/bridge)
14271427
"eD" = (

0 commit comments

Comments
 (0)