Skip to content

Commit

Permalink
Merge pull request #451 from molnizz/cringe3
Browse files Browse the repository at this point in the history 
No more rotate closets
  • Loading branch information
@MysticalFaceLesS
MysticalFaceLesS authored Apr 24, 2024
2 parents 0bf23a5 + 070e0e5 commit 2234298
Show file tree
Hide file tree
Showing 28 changed files with 197 additions and 182 deletions.
6 changes: 2 additions & 4 deletions _maps/_mod_celadon/shuttles/elysim/elysim_homa.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@
"hn" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/wall/orange{
dir = 1;
pixel_y = -30
},
/obj/item/clothing/mask/gas/welding,
Expand Down Expand Up @@ -493,7 +492,6 @@
/area/ship/hallway/central)
"lM" = (
/obj/structure/closet/wall{
dir = 1;
pixel_y = -30
},
/obj/item/disk/design_disk/ammo_c10mm,
Expand Down Expand Up @@ -667,7 +665,8 @@
"qG" = (
/obj/item/storage/firstaid/regular,
/obj/structure/closet/wall/white/med{
pixel_y = 30
pixel_y = 30;
dir = 1
},
/turf/open/floor/plating,
/area/ship/bridge)
Expand Down Expand Up @@ -931,7 +930,6 @@
pixel_y = 7
},
/obj/structure/closet/wall{
dir = 1;
pixel_y = -30
},
/obj/item/clothing/mask/bandana/durathread,
Expand Down
25 changes: 14 additions & 11 deletions _maps/_mod_celadon/shuttles/elysim/elysim_iron_maiden.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
},
/obj/structure/closet/wall/orange{
name = "fuel locker";
dir = 4;
dir = 8;
pixel_x = -28
},
/obj/effect/decal/cleanable/insectguts,
Expand Down Expand Up @@ -634,7 +634,8 @@
icon_door = "red_wall";
icon_state = "generic_wall";
name = "equipment locker";
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/effect/decal/cleanable/oil,
/obj/item/clothing/head/bandana/elysium/green,
Expand Down Expand Up @@ -704,7 +705,8 @@
icon_door = "red_wall";
icon_state = "generic_wall";
name = "equipment locker";
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/item/trash/chips,
/obj/item/clothing/head/bandana/elysium/green,
Expand Down Expand Up @@ -754,8 +756,7 @@
icon_door = "red_wall";
icon_state = "generic_wall";
name = "equipment locker";
pixel_y = -28;
dir = 1
pixel_y = -28
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/trash/chips,
Expand Down Expand Up @@ -1072,7 +1073,8 @@
/obj/structure/closet/wall{
icon_door = "orange_wall";
name = "uniform closet";
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/item/radio,
/obj/item/radio,
Expand Down Expand Up @@ -1126,7 +1128,8 @@
icon_door = "red_wall";
icon_state = "generic_wall";
name = "equipment locker";
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/head/bandana/elysium/green,
Expand Down Expand Up @@ -1302,7 +1305,8 @@
},
/obj/structure/closet/wall{
icon_state = "emergency_wall";
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/item/tank/internals/oxygen,
/obj/item/tank/internals/oxygen,
Expand Down Expand Up @@ -1342,7 +1346,7 @@
/obj/structure/closet/secure_closet/wall{
icon_door = "med_wall";
name = "medical locker";
dir = 4;
dir = 8;
pixel_x = -28
},
/obj/structure/cable{
Expand All @@ -1363,8 +1367,7 @@
icon_door = "red_wall";
icon_state = "generic_wall";
name = "equipment locker";
pixel_y = -28;
dir = 1
pixel_y = -28
},
/obj/structure/cable{
icon_state = "5-9"
Expand Down
1 change: 0 additions & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_alone.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
},
/obj/structure/cable,
/obj/structure/closet/wall{
dir = 1;
name = "Tools";
pixel_y = -30
},
Expand Down
9 changes: 5 additions & 4 deletions _maps/_mod_celadon/shuttles/independent/independent_caravan.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
"fv" = (
/obj/machinery/door/window/northleft,
/obj/structure/closet/wall{
dir = 4;
dir = 8;
pixel_x = -29
},
/obj/item/clothing/shoes/galoshes,
Expand Down Expand Up @@ -1252,7 +1252,8 @@
/obj/item/pipe_dispenser,
/obj/item/multitool,
/obj/structure/closet/wall/orange{
pixel_y = 32
pixel_y = 32;
dir = 1
},
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
Expand Down Expand Up @@ -1756,7 +1757,7 @@
dir = 8
},
/obj/structure/closet/wall{
dir = 4;
dir = 8;
pixel_x = -32
},
/obj/item/kinetic_crusher,
Expand Down Expand Up @@ -1962,7 +1963,7 @@
/area/ship/external)
"JR" = (
/obj/structure/closet/secure_closet/wall{
dir = 4;
dir = 8;
name = "kitchen freezer";
pixel_x = -28
},
Expand Down
20 changes: 12 additions & 8 deletions _maps/_mod_celadon/shuttles/independent/independent_elder.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@
/area/ship/hallway/central)
"cg" = (
/obj/structure/closet/emcloset/wall{
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -819,7 +820,7 @@
dir = 10
},
/obj/structure/closet/emcloset/wall{
dir = 8;
dir = 4;
pixel_x = 28
},
/obj/effect/turf_decal/trimline/opaque/red/arrow_cw{
Expand Down Expand Up @@ -854,7 +855,8 @@
/area/ship/hallway/port)
"iT" = (
/obj/structure/closet/firecloset/wall{
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/effect/turf_decal/siding/brown{
dir = 1
Expand Down Expand Up @@ -924,7 +926,8 @@
/area/ship/engineering/engine)
"jv" = (
/obj/structure/closet/firecloset/wall{
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -2398,7 +2401,8 @@
/area/ship/hallway/port)
"CF" = (
/obj/structure/closet/emcloset/wall{
pixel_y = 28
pixel_y = 28;
dir = 1
},
/obj/effect/turf_decal/siding/brown{
dir = 1
Expand Down Expand Up @@ -2664,7 +2668,7 @@
/area/ship/storage)
"HB" = (
/obj/structure/closet/wall/blue{
dir = 8;
dir = 4;
pixel_x = 28;
name = "Spare EVA Closet"
},
Expand Down Expand Up @@ -2697,7 +2701,7 @@
/area/ship/bridge)
"Ii" = (
/obj/structure/closet/firecloset/wall{
dir = 8;
dir = 4;
pixel_x = 28
},
/obj/effect/turf_decal/spline/fancy/wood{
Expand Down Expand Up @@ -4159,7 +4163,7 @@
/area/ship/hallway/starboard)
"ZI" = (
/obj/structure/closet/emcloset/wall{
dir = 8;
dir = 4;
pixel_x = 28
},
/obj/effect/turf_decal/spline/fancy/wood{
Expand Down
6 changes: 4 additions & 2 deletions _maps/_mod_celadon/shuttles/independent/independent_escapepod.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
/obj/item/kitchen/knife/combat/survival,
/obj/structure/closet/wall{
pixel_y = 31;
pixel_x = -3
pixel_x = -3;
dir = 1
},
/obj/item/storage/firstaid/medical,
/turf/open/floor/plasteel/dark,
Expand All @@ -28,7 +29,8 @@
},
/obj/structure/closet/wall{
pixel_y = 31;
pixel_x = 3
pixel_x = 3;
dir = 1
},
/obj/item/stack/sheet/mineral/plasma/five,
/obj/item/stack/sheet/metal/twenty,
Expand Down
16 changes: 7 additions & 9 deletions _maps/_mod_celadon/shuttles/independent/independent_halftrack.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
dir = 9
},
/obj/structure/closet/secure_closet/wall{
dir = 8;
dir = 4;
icon_state = "sec_wall";
name = "clothing locker";
pixel_x = 28;
Expand Down Expand Up @@ -394,7 +394,7 @@
name = "Commander magazine (Rubbershot 9mm)"
},
/obj/structure/closet/secure_closet/wall{
dir = 4;
dir = 8;
icon_state = "sec_wall";
name = "firearms locker";
pixel_x = -28;
Expand Down Expand Up @@ -546,7 +546,7 @@
icon_state = "1-2"
},
/obj/structure/closet/emcloset/wall{
dir = 4;
dir = 8;
pixel_x = -28
},
/obj/effect/turf_decal/number/five{
Expand Down Expand Up @@ -728,7 +728,7 @@
/obj/item/clothing/head/helmet/sec,
/obj/item/clothing/head/helmet/sec,
/obj/structure/closet/secure_closet/wall{
dir = 8;
dir = 4;
icon_state = "sec_wall";
name = "armor locker";
pixel_x = 28;
Expand Down Expand Up @@ -1042,7 +1042,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/structure/closet/secure_closet/wall{
dir = 4;
dir = 8;
icon_state = "sec_wall";
name = "firearms locker";
pixel_x = -28;
Expand Down Expand Up @@ -1348,7 +1348,7 @@
icon_state = "1-2"
},
/obj/structure/closet/firecloset/wall{
dir = 8;
dir = 4;
pixel_x = 28
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -1583,7 +1583,6 @@
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/structure/closet/secure_closet/wall{
dir = 1;
icon_state = "solgov_wall";
name = "head of security's closet";
pixel_y = -28;
Expand Down Expand Up @@ -1611,7 +1610,7 @@
/obj/item/ammo_box/magazine/toy/pistol,
/obj/item/ammo_box/magazine/toy/pistol,
/obj/structure/closet/wall/red{
dir = 8;
dir = 4;
pixel_x = 28;
name = "foam gun cabinet"
},
Expand Down Expand Up @@ -1948,7 +1947,6 @@
/area/template_noop)
"UJ" = (
/obj/structure/closet/secure_closet/wall{
dir = 1;
icon_state = "solgov_wall";
name = "captain's closet";
pixel_y = -28;
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_junker.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2268,7 +2268,7 @@
/obj/item/reagent_containers/food/drinks/bottle/hooch,
/obj/machinery/light/dim/directional/south,
/obj/structure/closet/wall/blue{
dir = 8;
dir = 4;
pixel_x = 32;
welded = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/_mod_celadon/shuttles/independent/independent_masinyane.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@
},
/obj/item/storage/firstaid/regular,
/obj/structure/closet/wall/blue{
dir = 4;
dir = 8;
name = "Equipment closet";
pixel_x = -30
},
Expand Down
Loading

0 comments on commit 2234298

Please sign in to comment.