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.

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

Forerunner Wall & Floor Tiles #3517

Merged
merged 5 commits into from
Dec 22, 2023
Merged
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
24 changes: 12 additions & 12 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1778,15 +1778,18 @@
#include "code\modules\halo\flora\jungle_tree.dm"
#include "code\modules\halo\flora\swamp_mushrooms.dm"
#include "code\modules\halo\flora\swamp_tree.dm"
#include "code\modules\halo\Forerunner\knight.dm"
#include "code\modules\halo\Forerunner\monitor.dm"
#include "code\modules\halo\Forerunner\sentinel.dm"
#include "code\modules\halo\Forerunner\sentinel_kit.dm"
#include "code\modules\halo\Forerunner\sentinel_spawner.dm"
#include "code\modules\halo\Forerunner\watcher.dm"
#include "code\modules\halo\Forerunner\species\knight\knight.dm"
#include "code\modules\halo\Forerunner\species\knight\knight_armour.dm"
#include "code\modules\halo\Forerunner\species\knight\knight_outfit.dm"
#include "code\modules\halo\forerunner\knight.dm"
#include "code\modules\halo\forerunner\monitor.dm"
#include "code\modules\halo\forerunner\sentinel.dm"
#include "code\modules\halo\forerunner\sentinel_kit.dm"
#include "code\modules\halo\forerunner\sentinel_spawner.dm"
#include "code\modules\halo\forerunner\watcher.dm"
#include "code\modules\halo\forerunner\species\knight\knight.dm"
#include "code\modules\halo\forerunner\species\knight\knight_armour.dm"
#include "code\modules\halo\forerunner\species\knight\knight_outfit.dm"
#include "code\modules\halo\forerunner\turfs\floor.dm"
#include "code\modules\halo\forerunner\turfs\materials.dm"
#include "code\modules\halo\forerunner\turfs\walls.dm"
#include "code\modules\halo\icons\machinery\lamp.dm"
#include "code\modules\halo\insurrection\access_ids.dm"
#include "code\modules\halo\insurrection\commando_outfits.dm"
Expand Down Expand Up @@ -2162,9 +2165,6 @@
#include "code\modules\halo\turfs\tech_floors.dm"
#include "code\modules\halo\turfs\tiles.dm"
#include "code\modules\halo\turfs\water_overrides.dm"
#include "code\modules\halo\turfs\forerunner\floor.dm"
#include "code\modules\halo\turfs\forerunner\materials.dm"
#include "code\modules\halo\turfs\forerunner\walls.dm"
#include "code\modules\halo\unsc\access.dm"
#include "code\modules\halo\unsc\combatdogs.dm"
#include "code\modules\halo\unsc\crew_monitor.dm"
Expand Down
42 changes: 42 additions & 0 deletions code/modules/halo/forerunner/turfs/floor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

/turf/simulated/floor/forerunner_alloy
name = "Alloy Flooring"
desc = "Floor made of an advanced alien alloy."
icon = 'code/modules/halo/forerunner/turfs/floors.dmi'
icon_state = "floortile"

heat_capacity = 17000

initial_flooring = /decl/flooring/forerunner_alloy

/decl/flooring/forerunner_alloy
name = "Alloy Flooring"
desc = "Floor made of an advanced alien alloy."
icon = 'code/modules/halo/forerunner/turfs/floors.dmi'
icon_base = "floortile"
flags = TURF_ACID_IMMUNE
build_type = null
build_cost = 2
build_time = 30
apply_thermal_conductivity = 0.025
apply_heat_capacity = 325000

/turf/simulated/floor/forerunner_alloy/old
name = "Alloy Flooring"
desc = "Floor made of an advanced alien alloy."
icon = 'code/modules/halo/forerunner/turfs/floors.dmi'
icon_state = "floortile_old"

initial_flooring = /decl/flooring/forerunner_alloy/old

/decl/flooring/forerunner_alloy/old
name = "Alloy Flooring"
desc = "Floor made of an advanced alien alloy."
icon = 'code/modules/halo/forerunner/turfs/floors.dmi'
icon_base = "floortile"
flags = TURF_ACID_IMMUNE
build_type = null
build_cost = 2
build_time = 30
apply_thermal_conductivity = 0.025
apply_heat_capacity = 325000
Binary file added code/modules/halo/forerunner/turfs/floors.dmi
Binary file not shown.
20 changes: 20 additions & 0 deletions code/modules/halo/forerunner/turfs/walls.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

/turf/simulated/wall/forerunner
name = "forerunner alloy wall"
desc = "An armor-plated wall which acts as both protection and separation"
icon_state = "forerunner_alloy"

floor_type = /turf/simulated/floor/forerunner_alloy

/turf/simulated/wall/forerunner/New(var/newloc)
. = ..(newloc,"forerunner alloy")

/turf/simulated/wall/forerunner/old
name = "forerunner alloy wall"
desc = "An armor-plated wall which acts as both protection and separation"
icon_state = "forerunner_alloy_old"

floor_type = /turf/simulated/floor/forerunner_alloy/old

/turf/simulated/wall/forerunner/New(var/newloc)
. = ..(newloc,"forerunner alloy")
22 changes: 0 additions & 22 deletions code/modules/halo/turfs/forerunner/floor.dm

This file was deleted.

Binary file removed code/modules/halo/turfs/forerunner/floors.dmi
Binary file not shown.
10 changes: 0 additions & 10 deletions code/modules/halo/turfs/forerunner/walls.dm

This file was deleted.

Binary file modified icons/turf/wall_masks.dmi
Binary file not shown.
Loading
Loading