Skip to content

Commit

Permalink
последний фикс атмоса
Browse files Browse the repository at this point in the history
  • Loading branch information
konushi committed Oct 30, 2024
1 parent 1486109 commit 13e5cbb
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 16 deletions.
66 changes: 53 additions & 13 deletions _maps/map_files220/RandomZLevels/Arrakis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,24 @@
color = "#e0ac7b"
},
/obj/effect/landmark/damageturf,
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = 10
},
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = 10
},
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = 10
},
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = -5
},
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = -5
},
/obj/item/reagent_containers/drinks/chicken_soup{
pixel_y = -5
},
/turf/simulated/floor/wood/oak,
/area/awaymission/arrakis/cave/cave1)
"aet" = (
Expand Down Expand Up @@ -2111,6 +2129,12 @@
color = "#45260f"
},
/area/awaymission/arrakis/cave/cave1)
"eze" = (
/mob/living/simple_animal/hostile/poison/giant_spider,
/turf/simulated/floor/brick/cold{
icon_state = "brick_boss2"
},
/area/awaymission/arrakis/cave/cave)
"eAk" = (
/obj/effect/landmark/damageturf,
/obj/effect/turf_decal/sand/plating,
Expand Down Expand Up @@ -2438,7 +2462,10 @@
/turf/simulated/wall/indestructible,
/area/awaymission/arrakis/outside_building)
"foI" = (
/turf/simulated/floor/indestructible/dune_sand,
/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
/turf/simulated/floor/brick/cold{
icon_state = "brick_boss2"
},
/area/awaymission/arrakis/cave/cave)
"fpT" = (
/obj/structure/telecrystal_deposit{
Expand Down Expand Up @@ -2691,6 +2718,13 @@
/area/awaymission/arrakis/outside/outside2)
"fQQ" = (
/obj/structure/closet/crate/wooden/wooden_crate,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/glasses/sunglasses,
/turf/simulated/floor/wood/oak,
/area/awaymission/arrakis/cave/cave1)
"fRY" = (
Expand Down Expand Up @@ -9828,6 +9862,12 @@
/obj/effect/decal/cleanable/dust,
/turf/simulated/floor/wood,
/area/awaymission/arrakis/outside/outside2)
"wDH" = (
/mob/living/simple_animal/hostile/poison/giant_spider,
/turf/simulated/floor/brick/cold{
icon_state = "brick_boss"
},
/area/awaymission/arrakis/cave/cave)
"wEO" = (
/obj/machinery/computer/nonfunctional{
dir = 4
Expand Down Expand Up @@ -22533,7 +22573,7 @@ aNV
aNV
aNV
lQv
cIO
wDH
cIO
atT
siG
Expand Down Expand Up @@ -23565,7 +23605,7 @@ cIO
cIO
siG
siG
cIO
wDH
cIO
lQv
aNV
Expand Down Expand Up @@ -25352,7 +25392,7 @@ lQv
aNV
siG
siG
siG
foI
atT
siG
lQv
Expand Down Expand Up @@ -25618,7 +25658,7 @@ cIO
siG
siG
siG
siG
eze
siG
aVN
siG
Expand Down Expand Up @@ -29731,7 +29771,7 @@ cIO
cIO
cIO
cIO
siG
foI
siG
cIO
cIO
Expand Down Expand Up @@ -31013,7 +31053,7 @@ siG
siG
siG
siG
siG
foI
siG
siG
siG
Expand Down Expand Up @@ -39119,8 +39159,8 @@ cnY
cnY
cnY
cnY
foI
foI
cnY
cnY
cnY
nnG
cnY
Expand Down Expand Up @@ -39377,7 +39417,7 @@ cnY
ayO
ayO
ayO
foI
cnY
aJs
aJs
cnY
Expand Down Expand Up @@ -39634,7 +39674,7 @@ ayO
ayO
ayO
ayO
foI
cnY
cnY
cnY
cnY
Expand Down Expand Up @@ -68498,7 +68538,7 @@ aec
jtU
jtU
cVF
tfX
jtU
ocM
rwT
brG
Expand Down Expand Up @@ -69265,7 +69305,7 @@ aXZ
bzD
aXZ
ocM
rhG
jtU
otL
dUB
aUm
Expand Down
1 change: 1 addition & 0 deletions modular_ss220/dunes_map/code/turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
/turf/simulated/floor/chasm/straight_down/lava_land_surface/dune_basalt
atmos_mode = ATMOS_MODE_EXPOSED_TO_ENVIRONMENT
atmos_environment = ENVIRONMENT_TEMPERATE
temperature = T20C
light_power = 0
light_range = 0

Expand Down
6 changes: 3 additions & 3 deletions modular_ss220/dunes_map/code/weather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
if(ishuman(L)) //Are you immune?
var/mob/living/carbon/human/H = L
var/eye_protection = H.check_eye_prot()
if(eye_protection >= FLASH_PROTECTION_WELDER)
if(eye_protection >= FLASH_PROTECTION_FLASH)
return TRUE
L = L.loc //Matryoshka check
return FALSE //RIP you
Expand All @@ -58,8 +58,8 @@
if(is_blind_immune(L))
return
if(!is_ash_immune(L))
L.adjustFireLoss(1)
L.SetSlowed(5,5)
L.adjustFireLoss(1.3)
L.SetSlowed(7,7)
var/blurr_prob = 40
if(prob(blurr_prob))
L.AdjustEyeBlurry (rand(2 SECONDS, 8 SECONDS))
Expand Down
Binary file modified modular_ss220/dunes_map/icons/weather.dmi
Binary file not shown.

0 comments on commit 13e5cbb

Please sign in to comment.