Merge pull request #11683 from timothyteakettle/wrestling_holodeck

holodeck WRESTLING
This commit is contained in:
kevinz000
2020-03-31 18:03:00 -07:00
committed by GitHub
3 changed files with 136 additions and 82 deletions
+113 -82
View File
@@ -17987,6 +17987,11 @@
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"Ui" = (
/obj/structure/table,
/obj/item/clothing/mask/luchador/tecnicos,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Uj" = (
/obj/machinery/door/airlock/centcom{
name = "Restroom";
@@ -18229,6 +18234,11 @@
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"Vk" = (
/obj/structure/table,
/obj/item/storage/belt/champion/wrestling/holodeck,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Vt" = (
/obj/item/paper/fluff/stations/centcom/disk_memo,
/obj/structure/noticeboard{
@@ -18393,6 +18403,11 @@
},
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"Wx" = (
/obj/structure/table,
/obj/item/clothing/mask/luchador,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Wz" = (
/obj/structure/table,
/obj/item/storage/backpack/duffelbag/med/surgery,
@@ -18766,6 +18781,11 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/centcom/holding)
"Yv" = (
/obj/structure/table,
/obj/item/clothing/mask/luchador/rudos,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Yw" = (
/turf/closed/indestructible/fakedoor{
name = "External Access"
@@ -18775,6 +18795,9 @@
/obj/machinery/door/airlock/titanium,
/turf/open/floor/mineral/titanium,
/area/centcom/evac)
"YC" = (
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"YJ" = (
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/item/reagent_containers/food/drinks/shaker,
@@ -18847,6 +18870,14 @@
},
/turf/open/floor/plasteel,
/area/centcom/supplypod)
"Zl" = (
/obj/structure/table,
/obj/item/clothing/gloves/boxing,
/obj/item/clothing/gloves/boxing/blue,
/obj/item/clothing/gloves/boxing/green,
/obj/item/clothing/gloves/boxing/yellow,
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Zr" = (
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
@@ -71980,18 +72011,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
ab
ag
ag
ag
ag
ag
ag
ag
ag
ag
ag
ab
aa
aa
aa
@@ -72237,18 +72268,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bj
YC
YC
YC
YC
YC
YC
YC
YC
YC
YC
fx
aa
aa
aa
@@ -72494,18 +72525,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bj
Vk
YC
YC
YC
YC
YC
YC
YC
YC
Vk
fx
aa
aa
aa
@@ -72751,18 +72782,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bj
Vk
YC
YC
YC
YC
YC
YC
YC
YC
Vk
fx
aa
aa
aa
@@ -73008,18 +73039,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bj
Vk
YC
YC
YC
YC
YC
YC
YC
YC
Vk
fx
aa
aa
aa
@@ -73265,18 +73296,18 @@ aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
aa
bj
YC
YC
Wx
YC
Yv
Ui
YC
Zl
YC
YC
fx
aa
aa
aa
@@ -73523,16 +73554,16 @@ ae
ae
ae
ab
ae
ae
ae
ae
ae
ae
ae
ae
ae
ae
ag
ag
ag
ag
ag
ag
ag
ag
ag
ag
ab
aa
aa