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

Various Mapping Resources #3551

Merged
merged 1 commit into from
Mar 12, 2024
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
1 change: 1 addition & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1789,6 +1789,7 @@
#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\structures_machines\structures.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"
Expand Down
30 changes: 29 additions & 1 deletion code/game/turfs/flooring/flooring_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -857,4 +857,32 @@ var/list/floor_decals = list()

/obj/effect/floor_decal/techfloor/hole/right
name = "hole right"
icon_state = "techfloor_hole_right"
icon_state = "techfloor_hole_right"

//Grass Edges

/obj/effect/floor_decal/grass_edge
name = "grass edge"
icon_state = "grass_edge"

/obj/effect/floor_decal/grass_edge/corner
name = "grass corner"
icon_state = "grass_edge_corner"

/obj/effect/floor_decal/grass_edge_light
icon_state = "grass_edge_light"

/obj/effect/floor_decal/grass_edge_light/corner
icon_state = "grass_edge_light_corner"

/obj/effect/floor_decal/grass_edge_tan
icon_state = "grass_edge_tan"

/obj/effect/floor_decal/grass_edge_tan/corner
icon_state = "grass_edge_tan_corner"

/obj/effect/floor_decal/grass_edge_dark
icon_state = "grass_edge_dark"

/obj/effect/floor_decal/grass_edge_dark_corner
icon_state = "grass_edge_dark_corner"
18 changes: 16 additions & 2 deletions code/modules/halo/forerunner/sentinel_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/structure/sentinel_spawner
name = "Sentinel spawner"
desc = "An ancient piece of Forerunner machinery that endlessly constructs sentinels to defend their installation."
icon = 'code/modules/halo/Forerunner/Sentinel.dmi'
icon = 'code/modules/halo/forerunner/sentinel.dmi'
icon_state = "spawner"
anchored = 1
var/list/all_sentinels = list()
Expand Down Expand Up @@ -42,4 +42,18 @@
next_sentinel_spawn = world.time + sentinel_respawn_time

/obj/structure/sentinel_spawner/respawn30sec
sentinel_respawn_time = 30 SECONDS
sentinel_respawn_time = 30 SECONDS

/obj/structure/sentinel_spawner_inactive
name = "Sentinel Spawner"
desc = "An ancient piece of Forerunner machinery that endlessly constructs Sentinels to defend their installations, this one appears to be inactive."
icon = 'code/modules/halo/forerunner/Sentinel.dmi'
icon_state = "disabled"
anchored = 1

/obj/structure/sentinel_spawner_inactive/heavy
name = "Sentinel Heavy Factory"
desc = "An ancient shaft containing more complex Forerunner machinery that endlessly constructs heavier versions of Sentinels to defend their installations, this one appears to be inactive."
icon = 'code/modules/halo/forerunner/heavy_sentinel_spawner.dmi'
icon_state = "disabled_closed"
anchored = 1
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

/obj/structure/forerunner_data_template
name = "Unknown Slab"
desc = "A tall slab, with a roughtly humanoid shaped etched upon its surface."
icon = 'code/modules/halo/forerunner/structures_machines/data_templates.dmi'
icon_state = "human_template"
density = 1
anchored = 1
Binary file modified icons/turf/flooring/decals.dmi
Binary file not shown.
Loading