Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,028 changes: 1,028 additions & 0 deletions _maps/iris/automapper/templates/centcom/interlink_lobby.dmm

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions _maps/nova/automapper/automapper_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@
# coordinates = [206, 85, 1]
# trait_name = "CentCom"

# Iris - Interlink Lobby
[templates.interlink_lobby]
map_files = ["interlink_lobby.dmm"]
directory = "_maps/iris/automapper/templates/centcom/"
required_map = "CentCom_nova_z2.dmm"
coordinates = [52, 186, 2]
trait_name = "CentCom"

# METASTATION MAP TEMPLATES
# Metastation Arrivals
[templates.metastaton_arrivals]
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/items/kirby_plants/kirbyplants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
// NOVA EDIT ADDITION START - AESTHETICS
if(icon_state in modular_states)
icon = 'modular_nova/modules/aesthetics/plants/icons/plants.dmi'
// IRIS ADDITION START
else if(icon_state == "iris")
icon = 'modular_iris/master_files/icons/obj/plants.dmi'
// IRIS ADDITION END
else
icon = 'icons/obj/fluff/flora/plants.dmi'
// NOVA EDIT ADDITION END
Expand Down Expand Up @@ -90,6 +94,7 @@
plant_states += "plant-[number]"
plant_states += "applebush"
plant_states += modular_states // NOVA EDIT ADDITION - AESTHETICS - SEE modular_nova\modules\aesthetics\plants\plants.dm
plant_states += "iris" // IRIS ADDITION

return plant_states

Expand All @@ -101,6 +106,12 @@
. = ..()
icon = 'icons/obj/fluff/flora/plants.dmi'
randomize_base_icon_state()
// IRIS EDIT START
if(check_holidays("Iris Week","Iris Station's Anniversary"))
icon = 'modular_iris/master_files/icons/obj/plants.dmi'
base_icon_state = "iris"
update_appearance(UPDATE_ICON)
// IRIS EDIT END

//Handles randomizing the icon during initialize()
/obj/item/kirbyplants/random/proc/randomize_base_icon_state()
Expand Down
Binary file modified icons/map_icons/clothing/head/_head.dmi
Binary file not shown.
Binary file modified icons/map_icons/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/map_icons/objects.dmi
Binary file not shown.
Binary file added modular_iris/icons/iris_logo.dmi
Binary file not shown.
75 changes: 75 additions & 0 deletions modular_iris/maps/cabriole.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
///////////////////////////////////////////////////////////////////
//////// Dedicated to staff and players of Iris Station 13 ////////
///////////////////////////////////////////////////////////////////

/obj/structure/iris_hologram
name = "Iris"
desc = "A holographic projection of an Iris flower. Looking at it brings back memories."
icon = 'modular_iris/icons/iris_logo.dmi'
icon_state = "iris"
max_integrity = 12062024
plane = 4
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/soundloop_type = /datum/looping_sound/iris_hologram
var/datum/proximity_monitor/elevator_music_area/sound_player
var/impressiveness = 100

/datum/looping_sound/iris_hologram
mid_sounds = list(
'sound/ambience/aurora_caelus/aurora_caelus_short.ogg'
)
volume = 15
direct = TRUE

/obj/structure/iris_hologram/Initialize(mapload)
. = ..()
makeHologram()
transform = transform.Scale(3, 3)
if(check_holidays("Iris Week","Iris Station's Anniversary"))
sound_player = new(src, range = 4, soundloop_type = src.soundloop_type)
AddElement(/datum/element/art, impressiveness)
AddElement(/datum/element/beauty, impressiveness * 75)

/obj/structure/iris_hologram/Destroy(force)
QDEL_NULL(sound_player)
return ..()

/obj/machinery/computer/terminal/iris
name = "info terminal"
desc = "A relatively low-tech info board."
icon_state = "plaque"
icon_screen = "plaque_screen"
icon_keyboard = null
max_integrity = 28022026
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | EMP_PROTECT_SELF
tguitheme = "ntos"
upperinfo = "In memory of Cabriole Sector, 12 VI 2564 - 28 II 2566"
content = list(
"While its many stories come to an abrupt close, many more await. No matter the paths we all choose to take, those stories are now part of who we are.",
"Thank you, to everyone who made it so special, no matter how much or how little they may have contributed. None of it could have been the same without them."
)

/obj/machinery/computer/terminal/iris/screwdriver_act()
return FALSE

/obj/structure/chair/sofa/bench/color/iris
post_init_icon_state = "bench_middle"
greyscale_config = /datum/greyscale_config/bench_middle
greyscale_colors = "#5d419f"

/obj/structure/chair/sofa/bench/color/iris/left
post_init_icon_state = "bench_left"
greyscale_config = /datum/greyscale_config/bench_left

/obj/structure/chair/sofa/bench/color/iris/right
post_init_icon_state = "bench_right"
greyscale_config = /datum/greyscale_config/bench_right

/obj/item/clothing/head/costume/nova/flowerpin/iris
greyscale_colors = "#5d419f"
desc = "A small flower pin resembling an iris flower."

/obj/item/kirbyplants/iris
icon_state = "iris"
icon = 'modular_iris/master_files/icons/obj/plants.dmi'
Binary file added modular_iris/master_files/icons/obj/plants.dmi
Binary file not shown.
12 changes: 11 additions & 1 deletion modular_iris/modules/holiday/holidays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
begin_day = 12
end_day = 14
begin_month = JUNE
holiday_hat = /obj/item/clothing/head/costume/party
holiday_hat = /obj/item/clothing/head/costume/nova/flowerpin/iris
holiday_colors = list(
COLOR_PRIDE_PURPLE,
COLOR_WHITE,
Expand All @@ -16,3 +16,13 @@

/datum/holiday/iris/getStationPrefix()
return pick("Cabriole","Iris","Anniversary","Aimatios")

/datum/holiday/iris/end // A week to remember
name = "Iris Week"
begin_day = 23
begin_month = FEBRUARY
end_day = 28
holiday_hat = /obj/item/clothing/head/costume/nova/flowerpin/iris

/datum/holiday/iris/end/greet()
return "Happy Iris Week! 28th of February marks the end of Iris Station. Thank you for being part of it!"
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6986,6 +6986,7 @@
#include "modular_iris\jobs\explorer.dm"
#include "modular_iris\jobs\freighter_access.dm"
#include "modular_iris\jobs\tcomm_specialist.dm"
#include "modular_iris\maps\cabriole.dm"
#include "modular_iris\maps\offstation\seedvault.dm"
#include "modular_iris\master_files\code\area\areas\traditional_directions_mass_override.dm"
#include "modular_iris\master_files\code\controllers\entries\config_entries.dm"
Expand Down
Loading