mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
These are not Vorestation edits. (#4088)
Y'all are confusing the shit out of us.
This commit is contained in:
@@ -623,7 +623,7 @@ var/global/datum/controller/occupations/job_master
|
||||
else
|
||||
spawnpos = spawntypes[H.client.prefs.spawnpoint]
|
||||
|
||||
if(spawnpos && istype(spawnpos) && spawnpos.turfs.len) // VOREStation Edit - Fix runtime if no landmarks exist for a spawntype
|
||||
if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)
|
||||
if(spawnpos.check_job_spawning(rank))
|
||||
H.forceMove(spawnpos.get_spawn_position())
|
||||
. = spawnpos.msg
|
||||
|
||||
@@ -124,7 +124,6 @@
|
||||
icon_state = "tile_white"
|
||||
no_variants = FALSE
|
||||
|
||||
// VOREStation Edit
|
||||
/obj/item/stack/tile/floor/techgrey
|
||||
name = "grey techfloor tile"
|
||||
singular_name = "grey techfloor tile"
|
||||
@@ -143,7 +142,6 @@
|
||||
icon_state = "tile_steel"
|
||||
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
|
||||
no_variants = FALSE
|
||||
// VOREStation Edit End
|
||||
|
||||
/obj/item/stack/tile/floor/steel
|
||||
name = "steel floor tile"
|
||||
|
||||
@@ -68,7 +68,6 @@
|
||||
new /obj/item/stack/rods(src.loc)
|
||||
qdel(src)
|
||||
return
|
||||
// VOREStation Edit - Added Catwalks
|
||||
if (istype(C, /obj/item/stack/rods))
|
||||
var/obj/item/stack/rods/R = C
|
||||
if(R.use(2))
|
||||
@@ -78,7 +77,6 @@
|
||||
new /obj/structure/catwalk(src.loc)
|
||||
qdel(src)
|
||||
return
|
||||
// VOREStation Edit End
|
||||
return
|
||||
|
||||
/obj/structure/lattice/proc/updateOverlays()
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
/obj/structure/railing/update_icon(var/UpdateNeighgors = 1)
|
||||
NeighborsCheck(UpdateNeighgors)
|
||||
//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // Vorestation edit because wtf does this even do
|
||||
//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do
|
||||
overlays.Cut()
|
||||
if (!check || !anchored)//|| !anchored
|
||||
icon_state = "railing0"
|
||||
|
||||
@@ -98,7 +98,6 @@ var/list/flooring_types
|
||||
'sound/effects/footstep/carpet4.ogg',
|
||||
'sound/effects/footstep/carpet5.ogg'))
|
||||
|
||||
// VOREStation Edit - Eris Carpets
|
||||
/decl/flooring/carpet/bcarpet
|
||||
name = "black carpet"
|
||||
icon_base = "bcarpet"
|
||||
@@ -133,14 +132,13 @@ var/list/flooring_types
|
||||
name = "orange carpet"
|
||||
icon_base = "oracarpet"
|
||||
build_type = /obj/item/stack/tile/carpet/oracarpet
|
||||
// VOREStation Edit End
|
||||
|
||||
/decl/flooring/tiling
|
||||
name = "floor"
|
||||
desc = "Scuffed from the passage of countless greyshirts."
|
||||
icon = 'icons/turf/flooring/tiles.dmi' // VOREStation Edit - Eris floors
|
||||
icon_base = "tiled" // VOREStation Edit - Eris floors
|
||||
has_damage_range = 2 // VOREStation Edit - Eris floors
|
||||
icon = 'icons/turf/flooring/tiles.dmi'
|
||||
icon_base = "tiled"
|
||||
has_damage_range = 2
|
||||
damage_temperature = T0C+1400
|
||||
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
|
||||
build_type = /obj/item/stack/tile/floor
|
||||
@@ -152,7 +150,6 @@ var/list/flooring_types
|
||||
'sound/effects/footstep/floor4.ogg',
|
||||
'sound/effects/footstep/floor5.ogg'))
|
||||
|
||||
//VOREStation Edit for icons and extra types
|
||||
/decl/flooring/tiling/tech
|
||||
desc = "Scuffed from the passage of countless greyshirts."
|
||||
icon = 'icons/turf/flooring/techfloor.dmi'
|
||||
|
||||
@@ -14,7 +14,7 @@ var/list/floor_decals = list()
|
||||
if(newcolour) color = newcolour
|
||||
..(newloc)
|
||||
|
||||
// VOREStation Edit - Hack to workaround byond crash bug
|
||||
// Hack to workaround byond crash bug
|
||||
/obj/effect/floor_decal/initialize()
|
||||
if(!floor_decals_initialized || !loc || QDELETED(src))
|
||||
return
|
||||
@@ -23,7 +23,6 @@ var/list/floor_decals = list()
|
||||
T.apply_decals()
|
||||
qdel(src)
|
||||
return
|
||||
// VOREStation Edit End
|
||||
|
||||
/obj/effect/floor_decal/reset
|
||||
name = "reset marker"
|
||||
|
||||
@@ -60,11 +60,10 @@ var/list/flooring_cache = list()
|
||||
if(!(istype(T) && T.flooring && T.flooring.name == flooring.name))
|
||||
overlays |= get_flooring_overlay("[flooring.icon_base]-corner-[SOUTHWEST]", "[flooring.icon_base]_corners", SOUTHWEST)
|
||||
|
||||
// VOREStation Edit - Hack workaround to byond crash bug
|
||||
// Hack workaround to byond crash bug
|
||||
//if(decals && decals.len)
|
||||
//overlays |= decals
|
||||
apply_decals()
|
||||
// VOREStation Edit End
|
||||
|
||||
if(is_plating() && !(isnull(broken) && isnull(burnt))) //temp, todo
|
||||
icon = 'icons/turf/flooring/plating.dmi'
|
||||
|
||||
Reference in New Issue
Block a user