cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deconflicts delta for the second time

Browse Source
This commit is contained in:
E-MonaRhg
2021-08-16 21:40:06 +02:00
parent 566b246a24
commit bf86c3dbff
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
+38 -35
View File
@@ -11815,6 +11815,7 @@
pixel_x = 26;
pixel_y = 26
},
/obj/item/gun/projectile/revolver/doublebarrel,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -13796,7 +13797,14 @@
/area/maintenance/auxsolarport)
"aKp" = (
/obj/structure/table/wood,
/obj/item/gun/projectile/revolver/doublebarrel,
/obj/item/wrench,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/cable_coil/random{
pixel_x = 2;
pixel_y = 3
},
/obj/item/stack/cable_coil/random,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -14444,15 +14452,7 @@
/area/crew_quarters/bar)
"aLN" = (
/obj/machinery/light,
/obj/structure/closet/gmcloset,
/obj/item/wrench,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/cable_coil/random{
pixel_x = 2;
pixel_y = 3
},
/obj/item/stack/cable_coil/random,
/obj/machinery/vending/bardrobe,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "dark"
@@ -16880,11 +16880,13 @@
},
/area/atmos)
"aRa" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -22
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/machinery/shower{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/engine/controlroom)
"aRb" = (
@@ -22870,10 +22872,8 @@
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bci" = (
/obj/item/radio/intercom{
pixel_y = 28
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/vending/hydrodrobe,
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bcj" = (
@@ -22881,6 +22881,9 @@
/obj/item/wrench,
/obj/item/clothing/suit/apron,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/item/radio/intercom{
pixel_y = 28
},
/turf/simulated/floor/plasteel,
/area/hydroponics)
"bck" = (
@@ -23028,8 +23031,8 @@
},
/area/atmos)
"bcz" = (
/obj/structure/closet/chefcloset,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/vending/chefdrobe,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -23142,6 +23145,7 @@
pixel_y = -27
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/machinery/vending/cargodrobe,
/turf/simulated/floor/plasteel{
icon_state = "purple"
},
@@ -24110,11 +24114,11 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/closet/wardrobe/atmospherics_yellow,
/obj/effect/decal/warning_stripes/yellow/hollow,
/obj/structure/closet/fireaxecabinet{
pixel_x = 30
},
/obj/machinery/vending/atmosdrobe,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -25991,7 +25995,7 @@
d2 = 8;
icon_state = "1-8"
},
/obj/item/twohanded/required/kirbyplants,
/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -39432,12 +39436,10 @@
/turf/simulated/floor/plasteel,
/area/maintenance/starboard2)
"bHJ" = (
/obj/structure/table/wood,
/obj/item/clipboard,
/obj/item/toy/figure/crew/detective,
/obj/structure/extinguisher_cabinet{
pixel_x = -28
},
/obj/machinery/vending/detdrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -41229,6 +41231,7 @@
/area/security/detectives_office)
"bLs" = (
/obj/structure/table/wood,
/obj/item/clipboard,
/obj/item/clothing/glasses/sunglasses,
/turf/simulated/floor/plasteel{
icon_state = "carpet"
@@ -54039,8 +54042,8 @@
/turf/simulated/floor/plasteel,
/area/engine/engineering)
"clt" = (
/obj/structure/closet/wardrobe/engineering_yellow,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/vending/engidrobe,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellow"
@@ -70833,8 +70836,7 @@
},
/area/medical/medbay3)
"cUm" = (
/obj/structure/closet/wardrobe/medical_white,
/obj/item/storage/backpack/satchel_med,
/obj/machinery/vending/medidrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -71619,11 +71621,11 @@
},
/area/medical/research)
"cVK" = (
/obj/structure/closet/wardrobe/chemistry_white,
/obj/effect/decal/warning_stripes/northwest,
/obj/structure/reagent_dispensers/fueltank/chem{
pixel_x = 32
},
/obj/machinery/vending/chemdrobe,
/turf/simulated/floor/plasteel,
/area/medical/chemistry)
"cVL" = (
@@ -72839,19 +72841,19 @@
},
/area/toxins/lab)
"cYz" = (
/obj/structure/table,
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/clothing/mask/gas,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/vending/scidrobe,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplefull"
},
/area/medical/research)
"cYA" = (
/obj/item/twohanded/required/kirbyplants,
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/table,
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/clothing/mask/gas,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplefull"
@@ -80341,6 +80343,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
/obj/machinery/vending/genedrobe,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -89456,7 +89459,6 @@
},
/area/hallway/primary/aft)
"dGT" = (
/obj/structure/closet/wardrobe/robotics_black,
/obj/structure/window/reinforced{
dir = 4
},
@@ -89465,6 +89467,7 @@
dir = 1;
pixel_y = -24
},
/obj/machinery/vending/robodrobe,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -90872,7 +90875,7 @@
},
/area/medical/virology)
"dJZ" = (
/obj/structure/closet/wardrobe/virology_white,
/obj/machinery/vending/virodrobe,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -100703,7 +100706,7 @@
icon_state = "4-8";
tag = ""
},
/obj/structure/closet/wardrobe/red,
/obj/machinery/vending/secdrobe,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"