Skip to content

Commit

Permalink
Cyberiad: Various improves and fixes (#991)
Browse files Browse the repository at this point in the history
1. Различные фиксы и улучшения Кибериады. 
 - Поправил летающие лампочки.
- Зона с названием "Consul Chamber" была заменена на понятную митинг
руму глав.
 - Добавил еще больше недостающего контента с оригинальной карты.
 - Поправил зону у Хопской.
- Вся тайлы воды на станции (по факту на мостике и в баньке) были
заменены на воду в которой нельзя рыбачить, кроме одной зоны - парка в
гетто, там все еще вода с рыбками.

2. Портировал еще один сайдинг с Пары.
3. Портировал с Пары статуи Кибериады и Дельты.
4. Добавил новый подтип воды no_fishing и альтернативный тайл воды с
спрайтом (модифицированным) с билда Mojave Sun.
5. Вроде пофиксил странное поведение лееров у шаттеров и бластдоров.

## Summary by Sourcery

Add statues for Cyberiad and Delta stations, a new "royal" siding type,
a new water subtype with no fishing, and an alternative water tile.
Update the Cyberiad map with content from the original map and replace
the "Consul Chamber" with a meeting room.

New Features:
- Added statues for Cyberiad and Delta stations.
- Added a new "royal" siding type.
- Added a new water subtype with no fishing and an alternative water
tile.

## Summary by Sourcery

Add statues for Cyberiad and Delta stations, add a new "royal" siding
type, and add a new water subtype with no fishing and an alternative
water tile. Update the Cyberiad map with content from the original map
and replace the "Consul Chamber" with a meeting room.

New Features:
- Add statues for Cyberiad and Delta stations.
- Add a new "royal" siding type.
- Add a new water subtype with no fishing and an alternative water tile.
  • Loading branch information
dj-34 authored Jan 15, 2025
1 parent f65287c commit e045a4c
Show file tree
Hide file tree
Showing 15 changed files with 620 additions and 326 deletions.
729 changes: 403 additions & 326 deletions _maps/map_files/Cyberiad/Cyberiad.dmm

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions code/__HELPERS/see_through_maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
#define SEE_THROUGH_MAP_THREE_X_TWO "3x2"
///One row of three tiles above the atom, but offset one tile to the left because of how billboards work
#define SEE_THROUGH_MAP_BILLBOARD "billboard"
// BANDASTATION ADDITION - START
///A 3x3 area, with the tile directly above hidden
#define SEE_THROUGH_MAP_STATION_STATUE "station_statue"
// BANDASTATION ADDITION - END
///Two rows of three wide, but offset one tile to the left because thats how shipping containers work
#define SEE_THROUGH_MAP_SHIPPING_CONTAINER "shipping_container"
///Seethrough component for the ratvar wreck, in shape of the ratvar wreck
Expand Down Expand Up @@ -68,6 +72,17 @@ GLOBAL_LIST_INIT(see_through_maps, list(
list(0, 1, 0), list(1, 1, 0), list(2, 1, 0),
list(0, 0, 0), list(1, 0, 0), list(2, 0, 0)
),
// BANDASTATION ADDITION - START
// XXX
// XXX
// XXX
// OAO
SEE_THROUGH_MAP_STATION_STATUE = list(
list(-1, 1, 0), list(0, 1, 0), list(1, 1, 0),
list(-1, 0, 0), list(0, 0, 0), list(1, 0, 0),
list(-1, -1, 0), list(0, -1, 0), list(1, -1, 0)
),
// BANDASTATION ADDITION - END
//No
SEE_THROUGH_MAP_RATVAR_WRECK = list(
list(3, 5, 0), list(4, 5, 0), list(5, 5, 0), list(6, 5, 0),
Expand Down
8 changes: 8 additions & 0 deletions modular_bandastation/mapping/code/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@

/obj/machinery/computer/security/telescreen
layer = SIGN_LAYER

/obj/machinery/door/poddoor
layer = BLASTDOOR_LAYER
closingLayer = ABOVE_WINDOW_LAYER

/obj/machinery/door/poddoor/shutters
layer = SHUTTER_LAYER
closingLayer = SHUTTER_LAYER
1 change: 1 addition & 0 deletions modular_bandastation/modular_bandastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "species/_species.dme"
#include "translations/_translations.dme"
#include "tts/_tts.dme"
#include "turfs/_turfs.dme"
#include "whitelist220/_whitelist220.dme"
#include "world_topics/_world_topics.dme"
#include "preferences/_preferences.dme"
Expand Down
15 changes: 15 additions & 0 deletions modular_bandastation/objects/code/effects/turf_decal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
layer = MID_TURF_LAYER // Above other decals

// MARK: Sidings
// Gold stripe
/obj/effect/turf_decal/siding/golden
icon = 'modular_bandastation/objects/icons/obj/effects/siding.dmi'
icon_state = "golden"
Expand All @@ -26,3 +27,17 @@

/obj/effect/turf_decal/siding/golden/end
icon_state = "golden_end"

// Gold "royal" siding
/obj/effect/turf_decal/siding/royal
icon = 'modular_bandastation/objects/icons/obj/effects/siding.dmi'
icon_state = "royal"

/obj/effect/turf_decal/siding/royal/corner
icon_state = "royal_corner"

/obj/effect/turf_decal/siding/royal/inner_corner
icon_state = "royal_corner_inner"

/obj/effect/turf_decal/siding/royal/end
icon_state = "royal_end"
144 changes: 144 additions & 0 deletions modular_bandastation/objects/code/structures/statues.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,150 @@
impressiveness = 50
abstract_type = /obj/structure/statue/themis

// Station statues
/obj/structure/statue/station_map
anchored = TRUE
impressiveness = 80
max_integrity = 500

/obj/structure/statue/station_map/Initialize(mapload)
. = ..()
AddComponent(/datum/component/seethrough, get_seethrough_map())

/obj/structure/statue/station_map/proc/get_seethrough_map()
return

/obj/structure/statue/station_map/wrench_act(mob/living/user, obj/item/tool)
return FALSE

/obj/structure/statue/station_map/Destroy()
for(var/obj/structure/statue/station_map/self in orange(3, src))
if(!QDELETED(self))
qdel(self)
return ..()

/obj/structure/statue/station_map/atom_deconstruct(disassembled = TRUE)
for(var/obj/structure/statue/station_map/self in orange(3, src))
if(!QDELETED(self))
qdel(self)
return ..()

// Cyberiad statue
/obj/structure/statue/station_map/cyberiad
name = "статуя Кибериады"
desc = "Гигантская модель научной станции «Кибериада». Судя по отличиям в конструкции, станцию несколько раз перестраивали."
icon = 'modular_bandastation/objects/icons/obj/structures/cyberiad.dmi'

/obj/structure/statue/station_map/cyberiad/nw
icon_state = "nw"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

/obj/structure/statue/station_map/cyberiad/north
icon_state = "north"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

/obj/structure/statue/station_map/cyberiad/ne
icon_state = "ne"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

// Adds transparency when the player gets behind an object, or is near it
/obj/structure/statue/station_map/cyberiad/nw/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/north/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/ne/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/w
icon_state = "west"

/obj/structure/statue/station_map/cyberiad/c
icon_state = "center"

/obj/structure/statue/station_map/cyberiad/e
icon_state = "east"

/obj/structure/statue/station_map/cyberiad/w/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/c/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/e/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/cyberiad/sw
icon_state = "sw"

/obj/structure/statue/station_map/cyberiad/s
icon_state = "south"

/obj/structure/statue/station_map/cyberiad/se
icon_state = "se"

// Delta statue
/obj/structure/statue/station_map/delta
name = "статуя Кербероса"
desc = "Гигантская модель научной станции «Керберос». Судя по отличиям в конструкции, станцию несколько раз перестраивали."
icon = 'modular_bandastation/objects/icons/obj/structures/delta.dmi'

/obj/structure/statue/station_map/delta/nw
icon_state = "nw"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

/obj/structure/statue/station_map/delta/north
icon_state = "north"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

/obj/structure/statue/station_map/delta/ne
icon_state = "ne"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER

// Adds transparency when the player gets behind an object, or is near it
/obj/structure/statue/station_map/delta/nw/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/north/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/ne/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/w
icon_state = "west"

/obj/structure/statue/station_map/delta/c
icon_state = "center"

/obj/structure/statue/station_map/delta/e
icon_state = "east"

/obj/structure/statue/station_map/delta/w/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/c/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/e/get_seethrough_map()
return SEE_THROUGH_MAP_STATION_STATUE

/obj/structure/statue/station_map/delta/sw
icon_state = "sw"

/obj/structure/statue/station_map/delta/s
icon_state = "south"

/obj/structure/statue/station_map/delta/se
icon_state = "se"

// MARK: Off-station statues
/obj/structure/statue/mooniverse
name = "Неизвестный агент"
Expand Down
Binary file modified modular_bandastation/objects/icons/obj/effects/siding.dmi
Binary file not shown.
Binary file modified modular_bandastation/objects/icons/obj/structures/chairs.dmi
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_bandastation/turfs/_turfs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/mobs
name = "Turfs"
desc = "Кастомные полы и стены."
author = "dj-34"
3 changes: 3 additions & 0 deletions modular_bandastation/turfs/_turfs.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_turfs.dm"

#include "code/water.dm"
23 changes: 23 additions & 0 deletions modular_bandastation/turfs/code/water.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/turf/open/water/no_fishing
fishing_datum = null // There's no fish in it

/turf/open/water/alternative
desc = "Прозрачная вода."
icon = 'modular_bandastation/turfs/icons/water.dmi'
icon_state = "water"
base_icon_state = "water"
baseturfs = /turf/open/water/alternative
immerse_overlay_color = "#7799AA"

/turf/open/water/alternative/no_fishing
fishing_datum = null // There's no fish in it

/turf/open/water/alternative/muddy
desc = "Очень старая стоячая вода. Туда страшно даже ногу опустить."
icon_state = "water_sewer"
base_icon_state = "water_sewer"
baseturfs = /turf/open/water/alternative/muddy
immerse_overlay_color = "#92aa77"

/turf/open/water/alternative/muddy/no_fishing
fishing_datum = null // There's no fish in it
4 changes: 4 additions & 0 deletions modular_bandastation/turfs/icons/attributions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Creative Commons 3.0 BY-NC-SA license.

All DMI files are also licensed under GNU AGPL v3.
water.dmi by Mojave Sun | https://github.com/Mojave-Sun/mojave-sun-13/blob/HEAD/mojave/icons/turf/water.dmi
Binary file added modular_bandastation/turfs/icons/water.dmi
Binary file not shown.

0 comments on commit e045a4c

Please sign in to comment.