cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed wallbumps on CC and shuttles (#28742)

Browse Source
This commit is contained in:
Hayden Redacted
2025-04-04 12:18:14 -04:00
committed by GitHub
parent 7b3c980347
commit 72fdd353b7
4 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/centcomm.dmm
+7 -7
View File
@@ -1433,6 +1433,10 @@
/area/wizard_station)
"fy" = (
/obj/machinery/sleeper,
/obj/machinery/light/small{
dir = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
icon_state = "cmo"
},
@@ -11681,6 +11685,9 @@
/area/shuttle/escape)
"OO" = (
/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -11748,9 +11755,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -13218,10 +13222,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
_maps/map_files/shuttles/admin_hospital.dmm
+13 -12
View File
@@ -39,13 +39,10 @@
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/external,
/obj/docking_port/mobile/admin{
dir = 2;
dwidth = 9;
height = 18;
id = "admin";
name = "hospital";
roundstart_move = "cc_bay_1";
timid = 1;
width = 19
},
/obj/machinery/door/poddoor{
@@ -275,7 +272,8 @@
pixel_y = 25
},
/obj/machinery/recharger/wallcharger{
pixel_y = 35
pixel_x = 32;
pixel_y = -3
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
@@ -287,13 +285,6 @@
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bu" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker/directional/north,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bv" = (
/obj/machinery/economy/vending/medical,
/obj/machinery/light{
@@ -345,6 +336,7 @@
/obj/item/reagent_containers/iv_bag/blood/o_minus,
/obj/item/reagent_containers/iv_bag/blood/o_minus,
/obj/item/reagent_containers/iv_bag/blood/o_minus,
/obj/structure/closet/walllocker/emerglocker/directional/east,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"bG" = (
@@ -701,6 +693,15 @@
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"MI" = (
/obj/machinery/light{
dir = 1
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/administration)
"RB" = (
/obj/machinery/sleeper{
dir = 1;
@@ -848,7 +849,7 @@ aT
aP
bb
Dw
bu
MI
aw
aw
bP
_maps/map_files/shuttles/emergency_jungle.dmm
+4 -7
View File
@@ -324,9 +324,6 @@
/turf/simulated/floor/grass,
/area/shuttle/escape)
"bA" = (
/obj/machinery/status_display{
pixel_y = -32
},
/obj/structure/chair/sofa/bamboo{
dir = 1
},
@@ -537,6 +534,9 @@
/area/shuttle/escape)
"cq" = (
/obj/machinery/sleeper,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/grass,
/area/shuttle/escape)
"cr" = (
@@ -549,9 +549,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
/obj/machinery/light/small{
dir = 4
},
/obj/structure/flora/junglebush,
/mob/living/simple_animal/hostile/retaliate/poison/snake,
/turf/simulated/floor/grass,
@@ -1307,7 +1304,7 @@ aa
aa
aa
ab
ab
aD
eP
HY
bM
_maps/map_files/shuttles/emergency_meta.dmm
+14 -15
View File
@@ -348,17 +348,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bd" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"be" = (
/obj/structure/table,
/obj/item/healthanalyzer,
@@ -371,7 +360,7 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/economy/vending/wallmed/directional/east,
/obj/machinery/economy/vending/wallmed/directional/south,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
"bh" = (
@@ -761,7 +750,6 @@
pixel_y = -28
},
/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/machinery/light,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
@@ -772,6 +760,7 @@
/obj/item/clipboard,
/obj/item/folder/yellow,
/obj/item/pen,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -799,6 +788,16 @@
"Rk" = (
/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"Tu" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -28
},
/turf/simulated/floor/mineral/titanium,
/area/shuttle/escape)
(1,1,1) = {"
aa
@@ -984,7 +983,7 @@ aM
ab
aW
au
aL
Tu
ab
bt
bE
@@ -1000,7 +999,7 @@ aL
ac
av
au
bd
aM
ab
ab
ab