Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Кучка фиксов #13230

Closed
wants to merge 9 commits into from
Closed

Кучка фиксов #13230

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9aadff4
Error-tiles fix: derelict_station.dmm
KatoMarika Jun 30, 2024
93a437d
Added corners to boxstation.dmm
KatoMarika Jun 30, 2024
dfd56b6
Suddenly, it was found on an old map: wildwest.dmm
KatoMarika Jun 30, 2024
68be8e3
floor to wood floor
KatoMarika Jun 30, 2024
ccb4a87
Research Ship no more visible for air alarm
KatoMarika Jul 1, 2024
83e7a7f
Added a red firemans helmet to atmospheric closet
KatoMarika Jul 1, 2024
7b794f4
The furniture in the third room for studying artifacts has been rearr…
KatoMarika Jul 1, 2024
f4dced7
Extra pipe removed
KatoMarika Jul 1, 2024
38cef92
Added lost APC's on prometheus.dmm and boxstation.dmm
KatoMarika Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 100 additions & 48 deletions maps/asteroid/asteroid.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3505,6 +3505,10 @@
dir = 4;
icon_state = "warn"
},
/obj/effect/decal/turf_decal{
dir = 8;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"hC" = (
Expand Down Expand Up @@ -4634,11 +4638,16 @@
/area/asteroid/research_outpost/hallway)
"jA" = (
/obj/machinery/light/small,
/obj/effect/decal/turf_decal/alpha/gray{
icon_state = "bot"
/obj/effect/decal/turf_decal{
dir = 8;
icon_state = "warn"
},
/obj/effect/decal/turf_decal/alpha/blue{
dir = 8;
icon_state = "loadingarea"
},
/turf/simulated/floor{
icon_state = "dark"
icon_state = "vaultfull"
},
/area/asteroid/research_outpost/tempstorage)
"jD" = (
Expand Down Expand Up @@ -4865,7 +4874,9 @@
dir = 9;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/turf/simulated/floor{
icon_state = "vaultfull"
},
/area/asteroid/research_outpost/tempstorage)
"kh" = (
/obj/structure/disposalpipe/trunk{
Expand All @@ -4879,7 +4890,9 @@
dir = 1;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/turf/simulated/floor{
icon_state = "vaultfull"
},
/area/asteroid/research_outpost/tempstorage)
"ki" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -5406,10 +5419,6 @@
dir = 6;
id = "anotempload"
},
/obj/effect/decal/turf_decal{
dir = 8;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/tempstorage)
"le" = (
Expand Down Expand Up @@ -5742,7 +5751,7 @@
},
/obj/effect/decal/turf_decal{
dir = 1;
icon_state = "ast_warn"
icon_state = "ast_warn_end"
},
/turf/simulated/floor/airless{
icon_state = "asteroidfloor"
Expand Down Expand Up @@ -5986,34 +5995,30 @@
/obj/machinery/conveyor{
id = "anotempload"
},
/obj/effect/decal/turf_decal{
dir = 4;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"mE" = (
/obj/machinery/conveyor{
dir = 1;
id = "anosample"
},
/obj/effect/decal/turf_decal{
dir = 4;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"mF" = (
/obj/machinery/conveyor_switch{
id = "anosample"
},
/obj/effect/decal/turf_decal{
dir = 1;
dir = 9;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"mG" = (
/obj/effect/decal/turf_decal{
dir = 1;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"mH" = (
Expand Down Expand Up @@ -6562,7 +6567,7 @@
req_access = list(65)
},
/obj/effect/decal/turf_decal{
dir = 1;
dir = 5;
icon_state = "ast_warn"
},
/turf/simulated/floor/airless{
Expand All @@ -6573,10 +6578,6 @@
/obj/machinery/conveyor{
id = "anotempload"
},
/obj/effect/decal/turf_decal{
dir = 1;
icon_state = "ast_warn"
},
/turf/simulated/floor/airless{
icon_state = "asteroidfloor"
},
Expand Down Expand Up @@ -10679,6 +10680,14 @@
/obj/structure/plasticflaps/mining,
/turf/simulated/floor,
/area/asteroid/mine/west_outpost)
"xP" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/asteroid/mine/explored)
"xU" = (
/obj/machinery/camera{
c_tag = "Misc Test Chamber";
Expand Down Expand Up @@ -10918,6 +10927,10 @@
dir = 4;
icon_state = "warn"
},
/obj/effect/decal/turf_decal{
dir = 8;
icon_state = "warn"
},
/turf/simulated/floor/plating,
/area/asteroid/research_outpost/maint)
"zd" = (
Expand Down Expand Up @@ -11094,6 +11107,11 @@
},
/turf/simulated/floor,
/area/asteroid/mine/eva)
"zr" = (
/turf/simulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/asteroid/mine/explored)
"zs" = (
/obj/machinery/atmospherics/components/unary/tank/air,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -12399,6 +12417,13 @@
},
/turf/simulated/floor/engine,
/area/asteroid/research_outpost/iso2)
"JI" = (
/obj/effect/decal/turf_decal{
dir = 1;
icon_state = "ast_warn"
},
/turf/simulated/floor/plating/airless/asteroid,
/area/asteroid/mine/explored)
"Kb" = (
/obj/structure/sign/warning/fire{
pixel_x = 32
Expand Down Expand Up @@ -12544,6 +12569,19 @@
icon_state = "asteroidfloor"
},
/area/asteroid/mine/explored)
"LP" = (
/obj/effect/decal/turf_decal{
dir = 8;
icon_state = "ast_warn"
},
/obj/effect/decal/turf_decal{
dir = 4;
icon_state = "ast_warn"
},
/turf/simulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/asteroid/mine/explored)
"Mb" = (
/obj/structure/sign/departments/chemistry{
desc = "A warning sign which reads 'SAMPLE PREPARATION'";
Expand Down Expand Up @@ -12628,6 +12666,16 @@
icon_state = "vaultfull"
},
/area/asteroid/research_outpost/outpost_misc_lab)
"MG" = (
/obj/effect/decal/turf_decal{
dir = 4;
icon_state = "ast_warn"
},
/turf/simulated/floor/airless{
dir = 5;
icon_state = "asteroidfloor"
},
/area/asteroid/mine/explored)
"Nb" = (
/obj/machinery/power/port_gen/pacman{
anchored = 1
Expand Down Expand Up @@ -13387,6 +13435,10 @@
/obj/machinery/light/small{
dir = 8
},
/obj/effect/decal/turf_decal{
dir = 4;
icon_state = "warn_corner"
},
/turf/simulated/floor/airless{
dir = 5;
icon_state = "asteroidfloor"
Expand Down Expand Up @@ -53888,8 +53940,8 @@ in
in
in
in
Aj
Aj
zr
zr
Aj
qZ
lA
Expand Down Expand Up @@ -54142,12 +54194,12 @@ le
nr
le
nR
oC
lA
rM
lA
lA
lA
MG
zr
xP
zr
zr
JI
lA
lA
lA
Expand Down Expand Up @@ -54400,11 +54452,11 @@ mC
lJ
nS
oD
lA
lA
lA
lA
lA
oE
zr
zr
zr
JI
lA
lA
kO
Expand Down Expand Up @@ -54656,12 +54708,12 @@ zc
hB
le
lR
oE
lA
lA
lA
lA
lA
LP
zr
zr
zr
zr
JI
lA
lA
kO
Expand Down Expand Up @@ -54914,11 +54966,11 @@ mE
nn
nU
oF
lA
lA
lA
lA
lA
oE
zr
zr
zr
JI
kO
kO
kO
Expand Down
30 changes: 27 additions & 3 deletions maps/boxstation/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77145,6 +77145,14 @@
icon_state = "4,6"
},
/area/shuttle/supply/station)
"kZI" = (
/obj/structure/flora/ausbushes/lavendergrass,
/obj/effect/decal/turf_decal/wood{
dir = 1;
icon_state = "spline_fancy_corner"
},
/turf/simulated/floor/grass,
/area/station/civilian/garden)
"lab" = (
/obj/machinery/firealarm{
dir = 1;
Expand Down Expand Up @@ -79318,6 +79326,14 @@
icon_state = "dark"
},
/area/station/aisat/ai_chamber)
"nrR" = (
/obj/structure/flora/tree/jungle,
/obj/effect/decal/turf_decal/wood{
dir = 4;
icon_state = "spline_fancy_corner"
},
/turf/simulated/floor/grass,
/area/station/civilian/garden)
"nsb" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/machinery/alarm{
Expand Down Expand Up @@ -82058,6 +82074,14 @@
icon_state = "dark"
},
/area/station/security/execution)
"qGt" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/effect/decal/turf_decal/wood{
dir = 2;
icon_state = "spline_fancy_corner"
},
/turf/simulated/floor/grass,
/area/station/civilian/garden)
"qGz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
Expand Down Expand Up @@ -136724,7 +136748,7 @@ cdn
cuE
cCt
aUM
ccX
kZI
cdc
bFo
iCb
Expand Down Expand Up @@ -137228,7 +137252,7 @@ aaa
aaa
bWu
bZn
bZp
qGt
aTf
cxu
cpE
Expand Down Expand Up @@ -137495,7 +137519,7 @@ cHi
cuE
cCK
bdq
cdb
nrR
ccX
bFo
iHb
Expand Down
Loading
Loading