Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Standardize material across Flock stuff #230

Merged
merged 2 commits into from
Apr 30, 2022
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
5 changes: 5 additions & 0 deletions code/mob/living/critter/flockcritter_parent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
speechverb_stammer = "buzzes"
custom_gib_handler = /proc/flockdronegibs
custom_vomit_type = /obj/decal/cleanable/flockdrone_debris/fluid
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE
// HEALTHS
var/health_brute = 1
var/health_burn = 1
Expand Down Expand Up @@ -52,6 +55,8 @@
..()

qdel(abilityHolder)
setMaterial(getMaterial("gnesis"))
src.material.setProperty("reflective", 45)
APPLY_ATOM_PROPERTY(src, PROP_MOB_RADPROT, src, 100)

// do not automatically set up a flock if one is not provided
Expand Down
32 changes: 32 additions & 0 deletions code/obj/flock/furniture.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
icon = 'icons/obj/furniture/table_flock.dmi'
auto_type = /obj/table/flock/auto
parts_type = /obj/item/furniture_parts/table/flock
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE

/obj/table/flock/New()
..()
setMaterial(getMaterial("gnesis"))

/obj/table/flock/special_desc(dist, mob/user)
if(isflock(user))
Expand All @@ -35,6 +42,13 @@
desc = "An extendable... <i>thing</i> that can be stretched out to make, uh, probably a table of some kind? Where's the goddamn instructions?!"
icon = 'icons/obj/furniture/table_flock.dmi'
furniture_type = /obj/table/flock/auto
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE

/obj/item/furniture_parts/table/flock/New()
..()
setMaterial(getMaterial("gnesis"))

/obj/item/furniture_parts/table/flock/special_desc(dist, mob/user)
if(isflock(user))
Expand All @@ -59,6 +73,13 @@
climbable = 0
parts_type = /obj/item/furniture_parts/flock_chair
scoot_sounds = list( 'sound/misc/chair/glass/scoot1.ogg', 'sound/misc/chair/glass/scoot2.ogg', 'sound/misc/chair/glass/scoot3.ogg', 'sound/misc/chair/glass/scoot4.ogg', 'sound/misc/chair/glass/scoot5.ogg' )
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE

/obj/stool/chair/comfy/flock/New()
..()
setMaterial(getMaterial("gnesis"))

/obj/stool/chair/comfy/flock/special_desc(dist, mob/user)
if(isflock(user))
Expand All @@ -78,6 +99,13 @@
stamina_cost = 10
furniture_type = /obj/stool/chair/comfy/flock
furniture_name = "thrumming alcove"
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE

/obj/item/furniture_parts/flock_chair/New()
..()
setMaterial(getMaterial("gnesis"))

/obj/item/furniture_parts/flock_chair/special_desc(dist, mob/user)
if(isflock(user))
Expand Down Expand Up @@ -193,9 +221,13 @@
power_usage = 0
on = 1
removable_bulb = 0
mat_appearances_to_ignore = list("gnesis")
mat_changename = 0
mat_changedesc = 0

/obj/machinery/light/flock/New()
..()
setMaterial(getMaterial("gnesis"))
light.set_color(0.45, 0.75, 0.675)
src.AddComponent(/datum/component/flock_protection, TRUE, FALSE, TRUE)

Expand Down
2 changes: 2 additions & 0 deletions code/obj/flock/structure/flock_structure_parent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
name = "uh oh"
desc = "CALL A CODER THIS SHOULDN'T BE SEEN"
flags = USEDELAY
mat_changename = FALSE
mat_changedesc = FALSE
var/flock_id = "ERROR"
/// when did we get created?
var/time_started = 0
Expand Down
2 changes: 2 additions & 0 deletions code/obj/machinery/door/feather.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
name = "weird imposing wall"
desc = "It sounds like it's hollow."
mat_appearances_to_ignore = list("steel","gnesis")
mat_changename = FALSE
mat_changedesc = FALSE
autoclose = 1
var/broken = 0
health = 80
Expand Down
3 changes: 3 additions & 0 deletions code/obj/window.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,9 @@
default_material = "gnesisglass"
hitsound = 'sound/impact_sounds/Crystal_Hit_1.ogg'
shattersound = 'sound/impact_sounds/Crystal_Shatter_1.ogg'
mat_appearances_to_ignore = list("gnesis")
mat_changename = FALSE
mat_changedesc = FALSE
health = 50 // as strong as reinforced glass, but not as strong as plasmaglass
health_max = 50
density = 1
Expand Down
2 changes: 2 additions & 0 deletions code/turf/turf_flock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ turf/simulated/floor/feather/proc/bfs(turf/start)//breadth first search, made by
var/max_health = 250
flags = USEDELAY
mat_appearances_to_ignore = list("steel", "gnesis")
mat_changename = FALSE
mat_changedesc = FALSE
connects_to = list(/turf/simulated/wall/auto/feather, /obj/machinery/door/feather)

var/broken = FALSE
Expand Down