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

Updated anomaly dimensional themes to use new walls #85851

Merged
merged 2 commits into from
Aug 15, 2024
Merged

Updated anomaly dimensional themes to use new walls #85851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
107ed37
updated anomaly dimensional themes to use new walls
Jacquerel Aug 15, 2024
8b3ee2b
deleted this by accident
Jacquerel Aug 15, 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
12 changes: 10 additions & 2 deletions code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,40 +236,46 @@
icon = 'icons/obj/stack_objects.dmi'
icon_state = "sheet-gold_2"
material = /datum/material/gold
replace_walls = /turf/closed/wall/mineral/gold

/datum/dimension_theme/plasma
name = "Plasma"
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "gas_alt"
material = /datum/material/plasma
replace_walls = /turf/closed/wall/mineral/plasma

/datum/dimension_theme/clown
name = "Clown"
icon = 'icons/obj/clothing/masks.dmi'
icon_state = "clown"
material = /datum/material/bananium
sound = 'sound/items/bikehorn.ogg'
replace_walls = /turf/closed/wall/mineral/bananium

/datum/dimension_theme/radioactive
name = "Radioactive"
icon = 'icons/obj/ore.dmi'
icon_state = "uranium"
material = /datum/material/uranium
sound = 'sound/items/welder.ogg'
replace_walls = /turf/closed/wall/mineral/uranium

/datum/dimension_theme/meat
name = "Meat"
icon = 'icons/obj/food/meat.dmi'
icon_state = "meat"
material = /datum/material/meat
sound = 'sound/items/eatfood.ogg'
replace_walls = /turf/closed/wall/mineral/meat

/datum/dimension_theme/pizza
name = "Pizza"
icon = 'icons/obj/food/pizza.dmi'
icon_state = "pizzamargherita"
material = /datum/material/pizza
sound = 'sound/items/eatfood.ogg'
replace_walls = /turf/closed/wall/mineral/pizza

/datum/dimension_theme/natural
name = "Natural"
Expand Down Expand Up @@ -316,7 +322,7 @@
name = "Winter Cabin"
icon = 'icons/obj/clothing/shoes.dmi'
icon_state = "iceboots"
replace_walls = /turf/closed/wall/mineral/wood
replace_walls = /turf/closed/wall/mineral/wood/nonmetal
replace_objs = list(
/obj/structure/chair = list(/obj/structure/chair/wood = 1),
/obj/machinery/door/airlock = list(/obj/machinery/door/airlock/wood = 1),
Expand Down Expand Up @@ -349,6 +355,7 @@
icon = 'icons/obj/debris.dmi'
icon_state = "small"
material = /datum/material/glass
replace_walls = /turf/closed/wall/mineral/titanium/survival // Until we decide what glass walls actually do
replace_floors = list(/turf/open/floor/glass = 1)
sound = SFX_SHATTER

Expand Down Expand Up @@ -402,6 +409,7 @@
name = "Disco"
icon = 'icons/obj/lighting.dmi'
icon_state = "lbulb"
replace_walls = /turf/closed/wall/fake_hierophant
material = /datum/material/glass
replace_floors = list(/turf/open/floor/light = 1)

Expand All @@ -419,7 +427,7 @@
icon_state = "tile_grass"
sound = SFX_CRUNCHY_BUSH_WHACK
replace_floors = list(/turf/open/floor/grass = 1)
replace_walls = /turf/closed/wall/mineral/wood
replace_walls = /turf/closed/wall/mineral/wood/nonmetal
replace_objs = list(
/obj/structure/chair = list(/obj/structure/chair/wood = 1),
/obj/machinery/door/airlock = list(/obj/machinery/door/airlock/wood = 1),
Expand Down
1 change: 1 addition & 0 deletions code/game/turfs/closed/indestructible.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
underlay_appearance.icon_state = "basalt"
return TRUE


/turf/closed/indestructible/riveted/hierophant
name = "wall"
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
Expand Down
7 changes: 7 additions & 0 deletions code/game/turfs/closed/wall/misc_walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@
smoothing_groups = null
use_splitvis = FALSE

/turf/closed/wall/fake_hierophant
name = "vibrant wall"
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
smoothing_groups = SMOOTH_GROUP_HIERO_WALL + SMOOTH_GROUP_TALL_WALLS
canSmoothWith = SMOOTH_GROUP_HIERO_WALL

/turf/closed/wall/material/meat
name = "living wall"
baseturfs = /turf/open/floor/material/meat
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/suits/reactive_armour_dimensional_themes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,25 @@
barricade = /obj/structure/holosign/barrier

/datum/armour_dimensional_theme/safe/meat
replace_wall = /turf/closed/wall/mineral/meat
material = /datum/material/meat

/// Dangerous themes can potentially impede the user as much as people pursuing them
/datum/armour_dimensional_theme/dangerous

/datum/armour_dimensional_theme/dangerous/clown
replace_wall = /turf/closed/wall/mineral/bananium
material = /datum/material/bananium
barricade = /obj/item/restraints/legcuffs/beartrap/prearmed
barricade_anchored = FALSE

/datum/armour_dimensional_theme/dangerous/radioactive
replace_wall = /turf/closed/wall/mineral/uranium
material = /datum/material/uranium
barricade = /obj/structure/statue/uranium/nuke

/datum/armour_dimensional_theme/dangerous/plasma
replace_wall = /turf/closed/wall/mineral/plasma
material = /datum/material/plasma
barricade = /obj/structure/statue/plasma/xeno

Expand Down
Loading