Skip to content

Commit

Permalink
Hybrisa Alpha 0.76
Browse files Browse the repository at this point in the history
  • Loading branch information
Zenith00000 committed May 6, 2024
1 parent a9c2c82 commit ab95b07
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 78 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,4 @@
#define SCAPE_PL_LV759_DERELICTSHIP list('sound/soundscape/lv759/indoors/derelict1.ogg','sound/soundscape/lv759/indoors/derelict2.ogg','sound/soundscape/lv759/indoors/derelict3.ogg','sound/soundscape/lv759/indoors/derelict4.ogg','sound/soundscape/lv759/indoors/derelict5.ogg','sound/soundscape/lv759/indoors/derelict6.ogg','sound/soundscape/lv759/indoors/derelict7.ogg','sound/soundscape/lv759/indoors/derelict8.ogg')
#define SCAPE_PL_LV759_CAVES list('sound/soundscape/lv759/outdoors/deepcave1.ogg','sound/soundscape/lv759/outdoors/deepcave2.ogg')
#define SCAPE_PL_LV759_WEYMART list('sound/soundscape/lv759/indoors/weymart1.ogg','sound/soundscape/lv759/indoors/weymart2.ogg','sound/soundscape/lv759/indoors/weymart3.ogg','sound/soundscape/lv759/indoors/weymart4.ogg')
#define SCAPE_PL_LV759_PLATEAU_OUTDOORS list('sound/soundscape/lv759/outdoors/derelict_plateau_1.ogg','sound/soundscape/lv759/outdoors/derelict_plateau_2.ogg',)
4 changes: 2 additions & 2 deletions code/game/area/LV759_Hybrisa_Prospera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
name = "Hybrisa - Indoors"
icon_state = "cliff_blocked"//because this is a PARENT TYPE and you should not be using it and should also be changing the icon!!!
ceiling = CEILING_METAL
soundscape_playlist = SCAPE_PL_LV522_INDOORS
soundscape_playlist = SCAPE_PL_LV759_INDOORS

/area/lv759/outdoors
name = "Hybrisa - Outdoors"
Expand Down Expand Up @@ -130,7 +130,7 @@
name = "Caverns - Plateau"
icon_state = "caves_plateau"
ceiling = CEILING_NONE
soundscape_playlist = SCAPE_PL_LV522_OUTDOORS
soundscape_playlist = SCAPE_PL_LV759_PLATEAU_OUTDOORS

// Colony Streets
/area/lv759/outdoors/colony_streets
Expand Down
5 changes: 2 additions & 3 deletions code/game/machinery/groundmap_geothermal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -712,12 +712,11 @@ GLOBAL_LIST_INIT(ship_floodlights, list())
unslashable = TRUE
unacidable = TRUE
wrenchable = FALSE
layer = TURF_LAYER
light_color = "#00ffa0"
lum_value = 14
light_power = 6
light_color = "#00ffa0"
lum_value = 14
light_power = 6

/obj/structure/machinery/colony_floodlight/engineer_circular/update_icon()
if(damaged)
icon_state = "engineerlight_off"
Expand Down
113 changes: 40 additions & 73 deletions maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2644,9 +2644,6 @@
},
/turf/open/hybrisa/street/asphalt,
/area/lv759/outdoors/landing_zone_2)
"axv" = (
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"axx" = (
/obj/structure/platform_decoration/strata/metal{
dir = 8
Expand Down Expand Up @@ -65723,12 +65720,6 @@
icon_state = "officetiles"
},
/area/lv759/indoors/weyyu_office/breakroom)
"kSv" = (
/obj/effect/hybrisa/decal/grate{
dir = 4
},
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"kSx" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/faxmachine,
Expand Down Expand Up @@ -72050,12 +72041,6 @@
/obj/structure/window/framed/hybrisa/marshalls/reinforced,
/turf/open/floor/plating,
/area/lv759/indoors/colonial_marshals/armory_foyer)
"lTd" = (
/obj/effect/hybrisa/decal/grate{
dir = 1
},
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"lTh" = (
/obj/effect/decal/warning_stripes{
icon_state = "E"
Expand Down Expand Up @@ -87864,10 +87849,6 @@
/obj/effect/hybrisa/decal/dirt,
/turf/open/hybrisa/street/asphalt,
/area/lv759/outdoors/colony_streets/east_central_street)
"oBR" = (
/obj/item/device/flashlight/lamp/tripod/grey,
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"oBT" = (
/obj/structure/stairs/perspective{
dir = 1;
Expand Down Expand Up @@ -100883,10 +100864,6 @@
icon = 'icons/turf/floors/hybrisa_dirt.dmi'
},
/area/lv759/indoors/caves/north_west_caves)
"qIE" = (
/obj/effect/hybrisa/decal/grate,
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"qIF" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/prop/helmetgarb/spacejam_tickets{
Expand Down Expand Up @@ -113715,12 +113692,6 @@
dir = 10
},
/area/lv759/outdoors/colony_streets/north_west_street)
"sKR" = (
/obj/effect/hybrisa/decal/grate{
dir = 8
},
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"sLd" = (
/obj/structure/machinery/prop/almayer/computer/PC{
dir = 4;
Expand Down Expand Up @@ -139329,10 +139300,6 @@
dir = 5
},
/area/lv759/outdoors/colony_streets/north_street)
"wXm" = (
/obj/item/lightstick/planted,
/turf/open/auto_turf/hybrisashale/layer0_plate,
/area/lv759/indoors/caves/central_caves)
"wXq" = (
/obj/effect/hybrisa/decal/dirt,
/obj/structure/prop/hybrisa/fakeplatforms/platform3,
Expand Down Expand Up @@ -171316,7 +171283,7 @@ smq
prc
prc
oYd
pSI
mil
lHS
qqW
qqW
Expand Down Expand Up @@ -171568,9 +171535,9 @@ smq
prc
prc
prc
oYd
ohF
oYd
guz
srR
guz
unn
unn
unn
Expand Down Expand Up @@ -171820,12 +171787,12 @@ prc
prc
smq
smq
kSv
qIE
axv
oYd
iLf
vJi
iep
guz
unn
oYd
guz
unn
unn
unn
Expand Down Expand Up @@ -172072,12 +172039,12 @@ oYd
prc
smq
jmf
smq
smq
qIE
pSI
axv
oYd
guG
guG
vJi
mil
iep
guz
unn
unn
jbZ
Expand Down Expand Up @@ -172323,13 +172290,13 @@ pTu
pSI
wgv
prc
sKR
smq
smq
lTd
axv
rHL
wXm
mnW
guG
guG
iwx
iep
jbZ
hmj
uKB
fAW
rYp
Expand Down Expand Up @@ -172574,13 +172541,13 @@ oYd
unn
unn
rHL
oYd
axv
sKR
lTd
smq
smq
axv
guz
iep
mnW
iwx
guG
guG
iep
iep
xAQ
oPG
Expand Down Expand Up @@ -172827,11 +172794,11 @@ unn
unn
unn
unn
oYd
axv
axv
smq
smq
guz
iep
iep
guG
guG
iLf
vJi
iep
Expand Down Expand Up @@ -173078,11 +173045,11 @@ unn
unn
unn
unn
oYd
oBR
rHL
ohF
axv
guz
xAQ
jbZ
srR
iep
iLf
guG
guG
Expand Down Expand Up @@ -173333,7 +173300,7 @@ unn
unn
unn
unn
rHL
jbZ
mDc
mnW
guG
Expand Down
Binary file not shown.
Binary file not shown.

0 comments on commit ab95b07

Please sign in to comment.