Skip to content

Commit 536476d

Browse files
TheChosenEvilOneTheChosenEvilOne
authored
Deathmatch fixes again, I am getting tired of making these. (#318)
* Fixes * mapdiff2 you piece of shit
1 parent 6ab9858 commit 536476d

File tree

5 files changed

+60
-33
lines changed

5 files changed

+60
-33
lines changed

‎_maps/map_files/DM/mech_madness.dmm‎

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
/area/deathmatch)
2525
"af" = (
2626
/obj/machinery/button/door{
27-
id = "dm1"
27+
id = "dm3";
28+
pixel_y = 24
2829
},
29-
/turf/open/floor/carpet/neon/simple/red,
30+
/turf/open/floor/carpet/neon/simple/teal,
3031
/area/deathmatch)
3132
"aj" = (
3233
/turf/open/floor/engine,
@@ -37,9 +38,9 @@
3738
"an" = (
3839
/obj/structure/table/reinforced,
3940
/obj/item/clothing/head/welding,
40-
/obj/item/weldingtool,
41-
/obj/item/inducer/sci,
4241
/obj/machinery/light/directional/west,
42+
/obj/item/inducer,
43+
/obj/item/weldingtool/largetank,
4344
/turf/open/floor/carpet/neon/simple/yellow,
4445
/area/deathmatch)
4546
"ao" = (
@@ -55,17 +56,23 @@
5556
"as" = (
5657
/obj/effect/landmark/deathmatch_player_spawn,
5758
/obj/effect/turf_decal/box,
59+
/obj/machinery/button/door{
60+
id = "dm1";
61+
pixel_x = 24
62+
},
5863
/turf/open/floor/carpet/neon/simple/yellow,
5964
/area/deathmatch)
6065
"at" = (
6166
/obj/effect/landmark/deathmatch_player_spawn,
6267
/obj/effect/turf_decal/box,
68+
/obj/machinery/button/door{
69+
id = "dm4";
70+
pixel_y = 0;
71+
pixel_x = -24
72+
},
6373
/turf/open/floor/carpet/neon/simple/green,
6474
/area/deathmatch)
6575
"aw" = (
66-
/obj/machinery/button/door{
67-
id = "dm4"
68-
},
6976
/turf/open/floor/carpet/neon/simple/purple,
7077
/area/deathmatch)
7178
"ax" = (
@@ -232,14 +239,15 @@
232239
/turf/open/floor/engine,
233240
/area/deathmatch)
234241
"bs" = (
235-
/obj/machinery/button/door{
236-
id = "dm2"
237-
},
238242
/turf/open/floor/carpet/neon/simple/blue,
239243
/area/deathmatch)
240244
"bt" = (
241245
/obj/effect/landmark/deathmatch_player_spawn,
242246
/obj/effect/turf_decal/box,
247+
/obj/machinery/button/door{
248+
id = "dm2";
249+
pixel_x = 24
250+
},
243251
/turf/open/floor/carpet/neon/simple/orange,
244252
/area/deathmatch)
245253
"bu" = (
@@ -248,9 +256,9 @@
248256
"bv" = (
249257
/obj/structure/table/reinforced,
250258
/obj/item/clothing/head/welding,
251-
/obj/item/weldingtool,
252-
/obj/item/inducer/sci,
253259
/obj/machinery/light/directional/east,
260+
/obj/item/inducer,
261+
/obj/item/weldingtool/largetank,
254262
/turf/open/floor/carpet/neon/simple/teal,
255263
/area/deathmatch)
256264
"bw" = (
@@ -484,9 +492,9 @@
484492
"cG" = (
485493
/obj/structure/table/reinforced,
486494
/obj/item/clothing/head/welding,
487-
/obj/item/weldingtool,
488-
/obj/item/inducer/sci,
489495
/obj/machinery/light/directional/east,
496+
/obj/item/inducer,
497+
/obj/item/weldingtool/largetank,
490498
/turf/open/floor/carpet/neon/simple/green,
491499
/area/deathmatch)
492500
"cH" = (
@@ -560,6 +568,10 @@
560568
"cX" = (
561569
/obj/effect/landmark/deathmatch_player_spawn,
562570
/obj/effect/turf_decal/box,
571+
/obj/machinery/button/door{
572+
id = "dm3";
573+
pixel_x = -24
574+
},
563575
/turf/open/floor/carpet/neon/simple/teal,
564576
/area/deathmatch)
565577
"cY" = (
@@ -605,9 +617,9 @@
605617
"di" = (
606618
/obj/structure/table/reinforced,
607619
/obj/item/clothing/head/welding,
608-
/obj/item/inducer/sci,
609620
/obj/item/weldingtool/largetank,
610621
/obj/machinery/light/directional/west,
622+
/obj/item/inducer,
611623
/turf/open/floor/carpet/neon/simple/orange,
612624
/area/deathmatch)
613625
"dk" = (
@@ -626,9 +638,6 @@
626638
/turf/open/floor/engine,
627639
/area/deathmatch)
628640
"go" = (
629-
/obj/machinery/button/door{
630-
id = "dm3"
631-
},
632641
/turf/open/floor/carpet/neon/simple/pink,
633642
/area/deathmatch)
634643
"gF" = (
@@ -662,6 +671,13 @@
662671
},
663672
/turf/open/floor/engine,
664673
/area/deathmatch)
674+
"pD" = (
675+
/obj/machinery/button/door{
676+
id = "dm1";
677+
pixel_y = -24
678+
},
679+
/turf/open/floor/carpet/neon/simple/yellow,
680+
/area/deathmatch)
665681
"sc" = (
666682
/obj/structure/table/reinforced,
667683
/obj/item/mecha_ammo/lmg,
@@ -685,6 +701,13 @@
685701
/obj/machinery/light/directional/south,
686702
/turf/open/floor/engine,
687703
/area/deathmatch)
704+
"Br" = (
705+
/obj/machinery/button/door{
706+
id = "dm4";
707+
pixel_y = -24
708+
},
709+
/turf/open/floor/carpet/neon/simple/green,
710+
/area/deathmatch)
688711
"ES" = (
689712
/obj/item/storage/bag/trash,
690713
/turf/open/floor/engine,
@@ -710,6 +733,13 @@
710733
"RN" = (
711734
/turf/closed/wall/mineral/plastitanium/nodiagonal,
712735
/area/deathmatch)
736+
"XP" = (
737+
/obj/machinery/button/door{
738+
id = "dm2";
739+
pixel_y = 24
740+
},
741+
/turf/open/floor/carpet/neon/simple/orange,
742+
/area/deathmatch)
713743
"Zw" = (
714744
/obj/structure/table/reinforced,
715745
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg{
@@ -782,8 +812,8 @@ ac
782812
(3,1,1) = {"
783813
ac
784814
ao
785-
af
786-
bu
815+
aJ
816+
pD
787817
ac
788818
aj
789819
ax
@@ -803,7 +833,7 @@ ax
803833
cC
804834
aj
805835
ac
806-
bh
836+
XP
807837
bs
808838
nE
809839
ac
@@ -1537,7 +1567,7 @@ ac
15371567
ac
15381568
by
15391569
aw
1540-
am
1570+
Br
15411571
ac
15421572
aj
15431573
aj
@@ -1557,7 +1587,7 @@ cB
15571587
ax
15581588
aj
15591589
ac
1560-
df
1590+
af
15611591
go
15621592
Zw
15631593
ac

‎_maps/map_files/DM/ragecage.dmm‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
/obj/effect/landmark/deathmatch_player_spawn,
9292
/turf/open/floor/plating,
9393
/area/deathmatch/fullbright)
94-
"T" = (
95-
/turf/open/space/basic,
96-
/area/deathmatch/fullbright)
9794
"V" = (
9895
/obj/structure/cable,
9996
/obj/structure/window/reinforced/spawner/west,
@@ -234,8 +231,8 @@ m
234231
m
235232
"}
236233
(8,1,1) = {"
237-
T
238-
T
234+
m
235+
m
239236
l
240237
A
241238
A
@@ -251,7 +248,7 @@ m
251248
m
252249
"}
253250
(9,1,1) = {"
254-
T
251+
m
255252
d
256253
k
257254
A
@@ -268,8 +265,8 @@ m
268265
m
269266
"}
270267
(10,1,1) = {"
271-
T
272-
T
268+
m
269+
m
273270
l
274271
A
275272
A

‎code/modules/deathmatch/deathmatch_loadouts.dm‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
name = "Operative"
5858
desc = "A syndicate operative."
5959
default_species = /datum/species/human
60-
outfit = /datum/outfit/syndicate_empty
6160

6261
/datum/deathmatch_loadout/operative/pre_equip(mob/living/carbon/human/player)
6362
player.equip_to_slot(new /obj/item/clothing/under/syndicate, ITEM_SLOT_ICLOTHING)

‎code/modules/deathmatch/deathmatch_lobby.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
playing = FALSE
5454
return FALSE
5555
var/list/spawns = game.load_location(location)
56-
if (!spawns)
56+
if (!length(spawns) || length(spawns) < length(players))
5757
stack_trace("Failed to get spawns when loading deathmatch map [map.name] for lobby [host].")
5858
game.clear_location(location)
5959
location = null

‎tgui/packages/tgui/interfaces/DeathmatchLobby.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ export const DeathmatchLobby = (props, context) => {
126126
</Box>
127127
<Button.Checkbox
128128
checked={data.global_chat}
129+
disabled={!(data.host || data.admin)}
129130
content="Global Chat"
130131
tooltip="Allow players and observers to talk with each other."
131132
onClick={() => act('host', {

0 commit comments

Comments
 (0)