Skip to content

Commit a8e484b

Browse files
Mister-MoriartyMister-Moriarty
committed
Merge branch 'master' into light-switch-remap
2 parents ca77573 + 8a33838 commit a8e484b

49 files changed

Lines changed: 2603 additions & 3622 deletions

Some content is hidden

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

‎assets/maps/listening_post/listeningpost_density2.dmm‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
"eH" = (
2828
/turf/simulated/floor/plating/airless/asteroid,
2929
/area/space)
30-
"ju" = (
31-
/obj/table/wood/auto{
32-
dir = 5
33-
},
34-
/obj/machinery/recharger,
35-
/obj/machinery/light_switch/directional/west,
36-
/turf/simulated/floor/black,
37-
/area/listeningpost/general)
3830
"jD" = (
3931
/obj/machinery/door/airlock/pyro/reinforced/syndicate/listeningpost{
4032
dir = 2;
@@ -263,6 +255,22 @@
263255
},
264256
/turf/simulated/floor/black,
265257
/area/listeningpost/general)
258+
"FO" = (
259+
/obj/table/wood/auto{
260+
dir = 5
261+
},
262+
/obj/item/paper_bin,
263+
/obj/item/paper/image/sstv/emerg1,
264+
/obj/item/paper/pipebombs{
265+
pixel_x = 11;
266+
pixel_y = 5
267+
},
268+
/obj/item/stamp/syndicate{
269+
pixel_x = -5;
270+
pixel_y = 7
271+
},
272+
/turf/simulated/floor/black,
273+
/area/listeningpost/general)
266274
"GE" = (
267275
/obj/computer3frame,
268276
/obj/cable{
@@ -286,11 +294,6 @@
286294
/obj/machinery/computer/power_monitor,
287295
/turf/simulated/floor/black,
288296
/area/listeningpost/general)
289-
"Hg" = (
290-
/obj/machinery/light_switch/directional/north,
291-
/obj/machinery/computer/television,
292-
/turf/simulated/floor/black,
293-
/area/listeningpost/tech_room)
294297
"HA" = (
295298
/obj/machinery/door_control/antagscanner{
296299
id = "Sleeper_Access";
@@ -352,6 +355,12 @@
352355
},
353356
/turf/simulated/floor/black,
354357
/area/listeningpost/general)
358+
"Od" = (
359+
/obj/machinery/light_switch/directional/east,
360+
/turf/simulated/floor/shuttle{
361+
icon_state = "floor4"
362+
},
363+
/area/listeningpost/syndicate_teleporter)
355364
"OK" = (
356365
/obj/cable/orange{
357366
icon_state = "1-8"
@@ -385,12 +394,6 @@
385394
/obj/item/shipcomponent/secondary_system/crash,
386395
/turf/simulated/floor/black,
387396
/area/listeningpost/general)
388-
"Rt" = (
389-
/obj/machinery/light_switch/directional/east,
390-
/turf/simulated/floor/shuttle{
391-
icon_state = "floor4"
392-
},
393-
/area/listeningpost/syndicate_teleporter)
394397
"Ru" = (
395398
/obj/cable{
396399
icon_state = "1-8"
@@ -408,22 +411,6 @@
408411
icon_state = "floor4"
409412
},
410413
/area/listeningpost/syndicate_teleporter)
411-
"UJ" = (
412-
/obj/table/wood/auto{
413-
dir = 5
414-
},
415-
/obj/item/paper_bin,
416-
/obj/item/paper/printout/emerg1,
417-
/obj/item/paper/pipebombs{
418-
pixel_x = 11;
419-
pixel_y = 5
420-
},
421-
/obj/item/stamp/syndicate{
422-
pixel_x = -5;
423-
pixel_y = 7
424-
},
425-
/turf/simulated/floor/black,
426-
/area/listeningpost/general)
427414
"UP" = (
428415
/obj/machinery/vending/floppy{
429416
profit = 0
@@ -447,6 +434,11 @@
447434
/obj/machinery/vending/jobclothing/syndicate,
448435
/turf/simulated/floor/black,
449436
/area/listeningpost/barracks)
437+
"XO" = (
438+
/obj/machinery/light_switch/directional/north,
439+
/obj/machinery/computer/television,
440+
/turf/simulated/floor/black,
441+
/area/listeningpost/tech_room)
450442
"Yc" = (
451443
/obj/machinery/communications_dish{
452444
name = "Communications dish"
@@ -457,6 +449,14 @@
457449
},
458450
/turf/simulated/floor/plating/airless,
459451
/area/listeningpost/comm_dish)
452+
"Yu" = (
453+
/obj/table/wood/auto{
454+
dir = 5
455+
},
456+
/obj/machinery/recharger,
457+
/obj/machinery/light_switch/directional/west,
458+
/turf/simulated/floor/black,
459+
/area/listeningpost/general)
460460
"YA" = (
461461
/obj/machinery/door_control/antagscanner{
462462
id = "Sleeper_Access";
@@ -896,7 +896,7 @@ Qd
896896
Ny
897897
uU
898898
dk
899-
ju
899+
Yu
900900
rL
901901
Bf
902902
Bf
@@ -994,7 +994,7 @@ rL
994994
zS
995995
sQ
996996
vi
997-
UJ
997+
FO
998998
xk
999999
Fz
10001000
UP
@@ -1063,7 +1063,7 @@ Tz
10631063
Tz
10641064
xC
10651065
xU
1066-
Hg
1066+
XO
10671067
si
10681068
JZ
10691069
tr
@@ -1128,7 +1128,7 @@ Bf
11281128
Bf
11291129
xC
11301130
Ki
1131-
Rt
1131+
Od
11321132
xC
11331133
xU
11341134
Bk

‎assets/maps/listening_post/listeningpost_kondaru.dmm‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
},
6868
/turf/simulated/floor/plating,
6969
/area/listeningpost/power)
70+
"ee" = (
71+
/obj/machinery/light_switch/directional/north,
72+
/obj/machinery/computer/camera_viewer,
73+
/turf/simulated/floor/black,
74+
/area/listeningpost/tech_room)
7075
"eh" = (
7176
/obj/cable/black{
7277
icon_state = "4-8"
@@ -244,6 +249,13 @@
244249
},
245250
/turf/simulated/floor/caution,
246251
/area/listeningpost/general)
252+
"nn" = (
253+
/obj/machinery/light/small{
254+
dir = 1
255+
},
256+
/obj/machinery/light_switch/directional/north,
257+
/turf/simulated/floor/black,
258+
/area/listeningpost/general)
247259
"nC" = (
248260
/obj/machinery/vending/floppy{
249261
profit = 0
@@ -266,12 +278,6 @@
266278
/obj/machinery/recharger,
267279
/turf/simulated/floor/black,
268280
/area/listeningpost/tech_room)
269-
"oD" = (
270-
/obj/stool/bed,
271-
/obj/item/clothing/suit/bedsheet,
272-
/obj/machinery/light_switch/directional/west,
273-
/turf/simulated/floor/carpet/grime,
274-
/area/listeningpost/barracks)
275281
"oO" = (
276282
/turf/simulated/floor/black,
277283
/area/listeningpost/general)
@@ -312,6 +318,24 @@
312318
},
313319
/turf/simulated/floor/black,
314320
/area/listeningpost/general)
321+
"pU" = (
322+
/obj/stool/bed,
323+
/obj/item/clothing/suit/bedsheet,
324+
/obj/item/device/radio/intercom/security{
325+
dir = 8
326+
},
327+
/obj/machinery/light_switch/directional/east{
328+
pixel_y = -16
329+
},
330+
/turf/simulated/floor/black,
331+
/area/listeningpost/tech_room)
332+
"re" = (
333+
/obj/table/wood/auto,
334+
/obj/item/paper_bin,
335+
/obj/item/pen,
336+
/obj/item/paper/image/sstv/emerg1,
337+
/turf/simulated/floor/black,
338+
/area/listeningpost/tech_room)
315339
"rQ" = (
316340
/turf/variableTurf/floor,
317341
/area/space)
@@ -461,13 +485,6 @@
461485
"yo" = (
462486
/turf/unsimulated/wall/auto/adventure/shuttle/dark,
463487
/area/listeningpost/syndicate_teleporter)
464-
"zt" = (
465-
/obj/machinery/light/small{
466-
dir = 1
467-
},
468-
/obj/machinery/light_switch/directional/north,
469-
/turf/simulated/floor/black,
470-
/area/listeningpost/general)
471488
"Bd" = (
472489
/obj/machinery/power/rtg/erebite_loaded,
473490
/obj/cable/orange,
@@ -642,6 +659,12 @@
642659
dir = 4
643660
},
644661
/area/listeningpost/syndicate_teleporter)
662+
"Iw" = (
663+
/obj/stool/bed,
664+
/obj/item/clothing/suit/bedsheet,
665+
/obj/machinery/light_switch/directional/west,
666+
/turf/simulated/floor/carpet/grime,
667+
/area/listeningpost/barracks)
645668
"IF" = (
646669
/obj/cable/black{
647670
icon_state = "1-2"
@@ -703,13 +726,6 @@
703726
},
704727
/turf/simulated/floor/caution,
705728
/area/listeningpost/general)
706-
"Lf" = (
707-
/obj/table/wood/auto,
708-
/obj/item/paper_bin,
709-
/obj/item/pen,
710-
/obj/item/paper/printout/emerg1,
711-
/turf/simulated/floor/black,
712-
/area/listeningpost/tech_room)
713729
"Lu" = (
714730
/obj/item/storage/wall/fire{
715731
pixel_x = -28;
@@ -770,11 +786,6 @@
770786
/obj/machinery/gravity_tether/multi_area/listening_post,
771787
/turf/simulated/floor/plating,
772788
/area/listeningpost/power)
773-
"Om" = (
774-
/obj/machinery/light_switch/directional/north,
775-
/obj/machinery/computer/camera_viewer,
776-
/turf/simulated/floor/black,
777-
/area/listeningpost/tech_room)
778789
"Pf" = (
779790
/obj/decal/stripe_delivery,
780791
/obj/machinery/door/airlock/pyro/reinforced/syndicate/listeningpost{
@@ -870,17 +881,6 @@
870881
},
871882
/turf/variableTurf/floor,
872883
/area/listeningpost/landing_bay)
873-
"UW" = (
874-
/obj/stool/bed,
875-
/obj/item/clothing/suit/bedsheet,
876-
/obj/item/device/radio/intercom/security{
877-
dir = 8
878-
},
879-
/obj/machinery/light_switch/directional/east{
880-
pixel_y = -16
881-
},
882-
/turf/simulated/floor/black,
883-
/area/listeningpost/tech_room)
884884
"VD" = (
885885
/obj/cable/black{
886886
icon_state = "1-2"
@@ -1369,7 +1369,7 @@ KJ
13691369
xQ
13701370
Dp
13711371
lY
1372-
oD
1372+
Iw
13731373
KJ
13741374
Sc
13751375
cY
@@ -1439,7 +1439,7 @@ KJ
14391439
KJ
14401440
Gx
14411441
KJ
1442-
zt
1442+
nn
14431443
cY
14441444
JR
14451445
oO
@@ -1674,7 +1674,7 @@ FD
16741674
gU
16751675
Bd
16761676
Gz
1677-
Om
1677+
ee
16781678
tA
16791679
eh
16801680
mh
@@ -1745,7 +1745,7 @@ Gz
17451745
Nm
17461746
JC
17471747
NF
1748-
Lf
1748+
re
17491749
Gz
17501750
Dh
17511751
yo
@@ -1777,7 +1777,7 @@ WC
17771777
WC
17781778
Gz
17791779
nC
1780-
UW
1780+
pU
17811781
mK
17821782
gs
17831783
Gz

‎assets/maps/listening_post/listeningpost_oshan.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
/turf/simulated/floor/black,
349349
/area/listeningpost/tech_room)
350350
"BR" = (
351-
/obj/item/paper/printout/emerg1,
351+
/obj/item/paper/image/sstv/emerg1,
352352
/obj/item/disk/data/cartridge/captain,
353353
/obj/item/disk/data/cartridge/captain{
354354
pixel_x = 3;

0 commit comments

Comments
 (0)