Skip to content

Commit c4e456e

Browse files
committed
rm/rf
1 parent 4d3afbb commit c4e456e

8 files changed

Lines changed: 4139 additions & 134 deletions

File tree

_maps/minigame/deathmatch/BYODM.dmm

Lines changed: 59 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
/obj/effect/turf_decal/stripes/line{
1515
dir = 8
1616
},
17-
/obj/item/storage/lockbox/dueling{
18-
req_access = null
17+
/obj/item/shield/roman{
18+
pixel_x = 4;
19+
pixel_y = -1
20+
},
21+
/obj/item/clothing/head/helmet/roman/legionnaire{
22+
pixel_x = -5;
23+
pixel_y = 8
1924
},
20-
/turf/open/indestructible/plating,
21-
/area/deathmatch/fullbright)
22-
"fS" = (
23-
/obj/effect/spawner/random/contraband/grenades/dangerous,
2425
/turf/open/indestructible/plating,
2526
/area/deathmatch/fullbright)
2627
"fX" = (
@@ -38,7 +39,6 @@
3839
/area/deathmatch/fullbright)
3940
"gD" = (
4041
/obj/structure/alien/weeds/node,
41-
/obj/effect/landmark/deathmatch_player_spawn,
4242
/obj/machinery/disposal/delivery_chute{
4343
dir = 8
4444
},
@@ -91,9 +91,11 @@
9191
/turf/open/indestructible/plating,
9292
/area/deathmatch/fullbright)
9393
"mX" = (
94-
/obj/structure/closet/secure_closet,
9594
/obj/effect/spawner/random/contraband/armory,
9695
/obj/effect/mob_spawn/corpse/human/skeleton,
96+
/obj/structure/closet/secure_closet{
97+
req_access = list("armory")
98+
},
9799
/turf/open/indestructible/plating,
98100
/area/deathmatch/fullbright)
99101
"nx" = (
@@ -110,6 +112,10 @@
110112
},
111113
/turf/open/indestructible/plating/airless,
112114
/area/deathmatch/fullbright)
115+
"pS" = (
116+
/obj/effect/decal/cleanable/blood/splatter,
117+
/turf/open/indestructible/plating,
118+
/area/deathmatch/fullbright)
113119
"pZ" = (
114120
/obj/effect/spawner/structure/flipped_table{
115121
dir = 1
@@ -139,13 +145,18 @@
139145
/turf/closed/indestructible/reinforced/titanium,
140146
/area/deathmatch/fullbright)
141147
"sd" = (
142-
/obj/structure/closet/secure_closet,
143148
/obj/effect/spawner/random/contraband/armory,
144149
/obj/effect/mob_spawn/corpse/human/intern,
150+
/obj/structure/closet/secure_closet{
151+
req_access = list("armory")
152+
},
145153
/turf/open/indestructible/plating,
146154
/area/deathmatch/fullbright)
147155
"tN" = (
148-
/obj/item/melee/baton/security/boomerang/loaded,
156+
/obj/machinery/field/generator/starts_on/magic,
157+
/obj/structure/disposalpipe/segment{
158+
dir = 5
159+
},
149160
/turf/open/indestructible/plating,
150161
/area/deathmatch/fullbright)
151162
"wD" = (
@@ -210,7 +221,11 @@
210221
/turf/open/indestructible/plating,
211222
/area/deathmatch/fullbright)
212223
"EC" = (
213-
/obj/effect/spawner/random/weapon,
224+
/obj/item/clothing/suit/utility/fire/firefighter,
225+
/obj/machinery/door/airlock/titanium{
226+
name = "Emergency Shuttle Airlock"
227+
},
228+
/obj/item/clothing/head/helmet/space/eva,
214229
/turf/open/indestructible/plating,
215230
/area/deathmatch/fullbright)
216231
"EJ" = (
@@ -229,6 +244,7 @@
229244
/area/deathmatch/fullbright)
230245
"ER" = (
231246
/obj/effect/gibspawner/human/bodypartless,
247+
/obj/effect/decal/cleanable/blood,
232248
/turf/open/indestructible/plating,
233249
/area/deathmatch/fullbright)
234250
"Fx" = (
@@ -239,16 +255,18 @@
239255
/turf/open/indestructible/plating,
240256
/area/deathmatch/fullbright)
241257
"FK" = (
242-
/obj/item/shield/roman,
243-
/obj/item/clothing/head/helmet/roman/legionnaire,
258+
/obj/effect/spawner/random/contraband/armory,
259+
/obj/structure/closet/secure_closet{
260+
req_access = list("armory")
261+
},
244262
/turf/open/indestructible/plating,
245263
/area/deathmatch/fullbright)
246264
"Gb" = (
247265
/obj/structure/disposalpipe/broken,
248-
/obj/structure/alien/weeds,
249266
/obj/effect/mob_spawn/corpse/human/doctor,
250267
/obj/item/clothing/mask/facehugger/impregnated,
251268
/obj/effect/decal/cleanable/blood/splatter,
269+
/obj/structure/alien/weeds,
252270
/turf/open/indestructible/plating,
253271
/area/deathmatch/fullbright)
254272
"Gx" = (
@@ -272,7 +290,6 @@
272290
pixel_x = -4;
273291
pixel_y = 4
274292
},
275-
/obj/effect/spawner/random/contraband/armory,
276293
/turf/open/indestructible/plating,
277294
/area/deathmatch/fullbright)
278295
"Ht" = (
@@ -281,6 +298,7 @@
281298
dir = 4
282299
},
283300
/obj/structure/alien/weeds,
301+
/obj/effect/landmark/deathmatch_player_spawn,
284302
/turf/open/indestructible/plating,
285303
/area/deathmatch/fullbright)
286304
"Hz" = (
@@ -294,8 +312,8 @@
294312
/turf/open/indestructible/plating,
295313
/area/deathmatch/fullbright)
296314
"Kd" = (
297-
/obj/structure/disposalpipe/segment,
298315
/obj/structure/alien/weeds,
316+
/obj/effect/decal/cleanable/blood/gibs/xeno,
299317
/turf/open/indestructible/plating,
300318
/area/deathmatch/fullbright)
301319
"Kk" = (
@@ -359,9 +377,12 @@
359377
"OP" = (
360378
/turf/closed/indestructible/reinforced/titanium/nodiagonal,
361379
/area/deathmatch/fullbright)
380+
"QE" = (
381+
/obj/effect/decal/cleanable/blood,
382+
/turf/open/indestructible/plating,
383+
/area/deathmatch/fullbright)
362384
"QP" = (
363-
/obj/item/gun/ballistic/bow,
364-
/obj/item/ammo_casing/arrow/poison,
385+
/obj/item/clothing/suit/armor/vest,
365386
/turf/open/indestructible/plating,
366387
/area/deathmatch/fullbright)
367388
"QR" = (
@@ -434,6 +455,7 @@
434455
/obj/structure/alien/weeds/node,
435456
/obj/effect/gibspawner/xeno,
436457
/obj/effect/mine/explosive/light,
458+
/obj/effect/decal/cleanable/blood/xeno,
437459
/turf/open/indestructible/plating,
438460
/area/deathmatch/fullbright)
439461
"Vd" = (
@@ -466,7 +488,9 @@
466488
/turf/open/indestructible/plating,
467489
/area/deathmatch/fullbright)
468490
"ZU" = (
469-
/obj/structure/closet/secure_closet,
491+
/obj/structure/closet/secure_closet{
492+
req_access = list("armory")
493+
},
470494
/obj/effect/spawner/random/contraband/armory,
471495
/turf/open/indestructible/plating,
472496
/area/deathmatch/fullbright)
@@ -584,7 +608,7 @@ OP
584608
Yf
585609
OP
586610
OP
587-
jJ
611+
EC
588612
OP
589613
jJ
590614
OP
@@ -686,7 +710,7 @@ EO
686710
EO
687711
EL
688712
EL
689-
EC
713+
EL
690714
EL
691715
EL
692716
EL
@@ -753,11 +777,11 @@ EO
753777
NR
754778
EO
755779
EL
756-
EL
757-
Dc
758-
CS
780+
yS
781+
tN
759782
CS
760783
CS
784+
Kd
761785
CS
762786
CS
763787
Dc
@@ -768,7 +792,7 @@ xm
768792
EL
769793
IG
770794
qy
771-
EL
795+
QP
772796
EL
773797
EL
774798
sd
@@ -786,9 +810,9 @@ Tg
786810
EO
787811
EO
788812
EO
789-
FK
790-
yS
791-
Kd
813+
EL
814+
EL
815+
Gx
792816
Hz
793817
RU
794818
ek
@@ -802,7 +826,7 @@ fX
802826
EJ
803827
EL
804828
EL
805-
tN
829+
EL
806830
EL
807831
EL
808832
EL
@@ -855,7 +879,7 @@ EO
855879
EO
856880
EO
857881
EL
858-
QP
882+
EL
859883
EL
860884
nx
861885
MR
@@ -907,7 +931,7 @@ qy
907931
EL
908932
EL
909933
EL
910-
ZU
934+
FK
911935
Yf
912936
Vd
913937
Vd
@@ -940,7 +964,7 @@ EL
940964
qy
941965
EL
942966
mX
943-
ZU
967+
FK
944968
Yf
945969
Yf
946970
Vd
@@ -957,7 +981,7 @@ EO
957981
EO
958982
EO
959983
EL
960-
EL
984+
pS
961985
EL
962986
EL
963987
Kk
@@ -967,7 +991,7 @@ EL
967991
EL
968992
EL
969993
EL
970-
fS
994+
EL
971995
Dq
972996
EL
973997
EL
@@ -1026,7 +1050,7 @@ EO
10261050
EO
10271051
EL
10281052
EL
1029-
EL
1053+
QE
10301054
EL
10311055
ij
10321056
QR

0 commit comments

Comments
 (0)