mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-20 19:44:46 +01:00
Added VOREStation comments to our custom lines that were missing them and removed debugging code.
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
|
||||
/obj/item/weapon/storage/box/survival/New()
|
||||
..()
|
||||
new /obj/item/clothing/mask/gas(src)
|
||||
new /obj/item/clothing/mask/gas(src) // VOREStation Edit - Tether
|
||||
new /obj/item/weapon/tank/emergency/oxygen(src)
|
||||
|
||||
//VS Edit
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
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))
|
||||
@@ -77,6 +78,7 @@
|
||||
new /obj/structure/catwalk(src.loc)
|
||||
qdel(src)
|
||||
return
|
||||
// VOREStation Edit End
|
||||
return
|
||||
|
||||
/obj/structure/lattice/proc/updateOverlays()
|
||||
|
||||
@@ -304,6 +304,7 @@
|
||||
desc = "A direction sign, pointing out which way the Cargo department is."
|
||||
icon_state = "direction_crg"
|
||||
|
||||
// VOREStation Edit - New signs for us
|
||||
/obj/structure/sign/directions/command
|
||||
icon = 'icons/obj/decals_vr.dmi'
|
||||
name = "\improper Command department"
|
||||
@@ -315,6 +316,7 @@
|
||||
name = "\improper Space Elevator"
|
||||
desc = "A direction sign, pointing out which way the Space Elevator is."
|
||||
icon_state = "direction_elv"
|
||||
// VOREStation Edit End
|
||||
|
||||
/obj/structure/sign/christmas/lights
|
||||
name = "Christmas lights"
|
||||
|
||||
@@ -98,6 +98,7 @@ 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"
|
||||
@@ -132,13 +133,14 @@ 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_vr.dmi'
|
||||
icon_base = "tiled"
|
||||
has_damage_range = 2
|
||||
icon = 'icons/turf/flooring/tiles_vr.dmi' // VOREStation Edit - Eris floors
|
||||
icon_base = "tiled" // VOREStation Edit - Eris floors
|
||||
has_damage_range = 2 // VOREStation Edit - Eris floors
|
||||
damage_temperature = T0C+1400
|
||||
flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN
|
||||
build_type = /obj/item/stack/tile/floor
|
||||
|
||||
@@ -5,11 +5,6 @@
|
||||
|
||||
// Define what criteria makes a turf a path or not
|
||||
|
||||
// Hack because we don't have catwalks
|
||||
/obj/structure/catwalk
|
||||
name = "catwalk"
|
||||
// End hack
|
||||
|
||||
// Turfs that will be colored as HOLOMAP_ROCK
|
||||
#define IS_ROCK(tile) (istype(tile, /turf/simulated/mineral) && tile.density)
|
||||
|
||||
@@ -63,7 +58,6 @@ var/global/list/extraMiniMaps = list()
|
||||
|
||||
// Generates the "base" holomap for one z-level, showing only the physical structure of walls and paths.
|
||||
/proc/generateHoloMinimap(var/zLevel = 1)
|
||||
//log_debug("Generating base minimap for z=[zLevel]")
|
||||
// Save these values now to avoid a bazillion array lookups
|
||||
var/offset_x = HOLOMAP_PIXEL_OFFSET_X(zLevel)
|
||||
var/offset_y = HOLOMAP_PIXEL_OFFSET_Y(zLevel)
|
||||
@@ -93,9 +87,7 @@ var/global/list/extraMiniMaps = list()
|
||||
// This seems to do the drawing thing, but draws only the areas, having nothing to do with the tiles.
|
||||
// Leshana: I'm guessing this map will get overlayed on top of the base map at runtime? We'll see.
|
||||
// Wait, seems we actually blend the area map on top of it right now! Huh.
|
||||
// It does a bunch of other stuff too tho, lets check what that is.
|
||||
/proc/generateStationMinimap(var/zLevel)
|
||||
//log_debug("Generating station minimap for z=[zLevel]")
|
||||
// Save these values now to avoid a bazillion array lookups
|
||||
var/offset_x = HOLOMAP_PIXEL_OFFSET_X(zLevel)
|
||||
var/offset_y = HOLOMAP_PIXEL_OFFSET_Y(zLevel)
|
||||
@@ -168,15 +160,6 @@ var/global/list/extraMiniMaps = list()
|
||||
extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAP]_[zLevel]"] = big_map
|
||||
extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAPSMALL]_[zLevel]"] = actual_small_map
|
||||
|
||||
//
|
||||
// ## Debugging and Testing ##
|
||||
//
|
||||
|
||||
/client/verb/debug_map()
|
||||
set category = "Debug"
|
||||
set name = "Debug Map Datum"
|
||||
debug_variables(using_map)
|
||||
|
||||
// TODO - Holomap Markers!
|
||||
// /proc/generateMinimapMarkers(var/zLevel)
|
||||
// // Save these values now to avoid a bazillion array lookups
|
||||
|
||||
Reference in New Issue
Block a user