Stairs unit test (#18465)

* sdf

* fsaddf

* sadf

* sadf

* expanded documentation on stairs
This commit is contained in:
Fluffy
2024-02-20 12:37:30 +01:00
committed by GitHub
parent 919130bfb3
commit 4311296f91
10 changed files with 217 additions and 269 deletions
+1
View File
@@ -3548,6 +3548,7 @@
#include "code\unit_tests\species_tests.dm"
#include "code\unit_tests\sql_tests.dm"
#include "code\unit_tests\ss_test.dm"
#include "code\unit_tests\stairs_type.dm"
#include "code\unit_tests\subsystem_init.dm"
#include "code\unit_tests\timer_sanity.dm"
#include "code\unit_tests\unit_test.dm"
+2
View File
@@ -68,6 +68,7 @@
desc = "This sign indicates this crossing street is called [street_name]."
/obj/structure/stairs/urban
abstract_type = /obj/structure/stairs/urban
icon = 'icons/obj/structure/urban/ledges.dmi'
icon_state = "stairs-single"
layer = 2.01
@@ -96,6 +97,7 @@
desc = "A solid asphalt ramp to allow your vehicle to traverse inclines with ease."
icon_state = "road-ramp-center"
layer = 2.02
abstract_type = /obj/structure/stairs/urban/road_ramp
/obj/structure/stairs/urban/road_ramp/right
dir = EAST
+21 -4
View File
@@ -201,7 +201,27 @@
/obj/structure/ladder/away //a ladder that just looks like it's going down
icon_state = "ladderawaydown"
/// Note that stairs facing left/right may need the stairs_lower structure if they're not placed against walls.
/**
* #Stairs
*
* Stairs allow you to traverse up and down between Z-levels
*
* They _MUST_ follow this bound rules:
*
* -If facing NORTH: `bound_height` to 64 and `bound_y` to -32
*
* -If facing SOUTH: `bound_height` to 64
*
* -If facing EAST: `bound_width` to 64 and `bound_x` to -32
*
* -If facing WEST: `bound_width` to 64
*
* No other bounds should be set on them except the ones described above
*
* A subtype must be defined, and those bounds set in code. DO NOT SET IT ON THE MAP ITSELF!
*
* Note that stairs facing left/right may need the stairs_lower structure if they're not placed against walls
*/
/obj/structure/stairs
name = "stairs"
desc = "Stairs leading to another floor. Not too useful if the gravity goes out."
@@ -298,9 +318,6 @@
dir = WEST
bound_width = 64
/obj/structure/stairs/flat
icon_state = "stairs_flat"
/// Snowflake railing object for 64x64 stairs.
/obj/structure/stairs_railing
name = "railing"
+31
View File
@@ -341,5 +341,36 @@
return 1
/datum/unit_test/map_test/stairs_mapped
name = "MAP: Stairs"
/datum/unit_test/map_test/stairs_mapped/start_test()
var/test_status = UNIT_TEST_PASSED
//Loop through all the stairs in the map
for(var/obj/structure/stairs/a_stair in world)
//See if there is any other stair in the same turf
for(var/obj/structure/stairs/possibly_another_stair in get_turf(a_stair))
if(a_stair != possibly_another_stair)
test_status = TEST_FAIL("Duplicate stairs located in [a_stair.x]X - [a_stair.y]Y - [a_stair.z]Z! \
Only one stair should exist inside a turf.")
if(is_abstract(a_stair))
test_status = TEST_FAIL("The stairs located in [a_stair.x]X - [a_stair.y]Y - [a_stair.z]Z are of an abstract type ([a_stair.type]) that should never be mapped!")
//Check that noone changed the bounds in the map editor
if(a_stair.bound_height != initial(a_stair.bound_height) || a_stair.bound_width != initial(a_stair.bound_width) || \
a_stair.bound_x != initial(a_stair.bound_x) || a_stair.bound_y != initial(a_stair.bound_y))
test_status = TEST_FAIL("The stairs at [a_stair.x]X - [a_stair.y]Y - [a_stair.z]Z have map-defined bounds!")
if(test_status == UNIT_TEST_PASSED)
TEST_PASS("All the mapped stairs are valid.")
else
TEST_FAIL("Some mapped stairs are invalid!")
return test_status
#undef SUCCESS
#undef FAILURE
+1 -1
View File
@@ -129,7 +129,7 @@ SUBSYSTEM_DEF(unit_tests)
for(var/thing in subtypesof(/datum/unit_test) - typecacheof(SSatlas.current_map.excluded_test_types))
var/datum/unit_test/D = new thing
if(findtext(D.name, "template"))
if(findtext(D.name, "template") || is_abstract(D))
qdel(D)
continue
+33
View File
@@ -0,0 +1,33 @@
/datum/unit_test/stairs_type
name = "Test stairs types"
groups = list("generic")
priority = 1
/datum/unit_test/stairs_type/start_test()
var/test_status = UNIT_TEST_PASSED
for(var/obj/structure/stairs/stair_type as anything in subtypesof(/obj/structure/stairs))
//No need for abstract stairs to respect this really
if(is_abstract(stair_type))
continue
//The bounds have to be set based on the direction of the stairs, that must be set in code for sanity
switch(initial(stair_type.dir))
if(NORTH)
if((initial(stair_type.bound_height) != 64) || (initial(stair_type.bound_y) != -32))
test_status = TEST_FAIL("The stairs type [stair_type.type] does not have the bounds set correctly!")
if(SOUTH)
if((initial(stair_type.bound_height) != 64) || (initial(stair_type.bound_y) != 0))
test_status = TEST_FAIL("The stairs type [stair_type.type] does not have the bounds set correctly!")
if(EAST)
if((initial(stair_type.bound_width) != 64) || (initial(stair_type.bound_x) != -32))
test_status = TEST_FAIL("The stairs type [stair_type.type] does not have the bounds set correctly!")
if(WEST)
if((initial(stair_type.bound_width) != 64) || (initial(stair_type.bound_x) != 0))
test_status = TEST_FAIL("The stairs type [stair_type.type] does not have the bounds set correctly!")
return test_status
+1
View File
@@ -42,6 +42,7 @@ var/ascii_reset = "[ascii_esc]\[0m"
// Templates aren't intended to be ran but just serve as a way to create child objects of it with inheritable tests for quick test creation.
/datum/unit_test
abstract_type = /datum/unit_test
var/name = "template - should not be ran."
var/disabled = 0 // If we want to keep a unit test in the codebase but not run it for some reason.
var/async = 0 // If the check can be left to do it's own thing, you must define a check_result() proc if you use this.
@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: FluffyGhost
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- backend: "Added a test to verify stairs have the proper bounds set, are not abstract objects."
- backend: "Added a test to verify mapped stairs are not duplicated."
- backend: "Unit tests can now be marked as abstract and they would be ignored from running."
- maptweak: "Fixed point verdant leftover stairs once more."
@@ -454,7 +454,6 @@
pixel_y = 4
},
/obj/item/trash/cigbutt{
pixel_y = 0;
pixel_x = 10
},
/obj/random/dirt_75,
@@ -904,13 +903,6 @@
},
/turf/simulated/floor/asphalt,
/area/point_verdant/sewer)
"cR" = (
/obj/structure/stairs/urban{
dir = 8;
icon_state = "stairs-left"
},
/turf/simulated/floor/concrete,
/area/point_verdant/outdoors)
"cS" = (
/obj/structure/table/rack/clothing{
dir = 4;
@@ -1259,43 +1251,28 @@
"ea" = (
/obj/structure/table/rack/retail_shelf,
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -8;
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/soju{
pixel_x = 8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -8;
pixel_y = 0
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -8;
pixel_y = 0
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -8;
pixel_y = 0
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -8;
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/soju{
pixel_x = 8
},
@@ -1311,9 +1288,7 @@
/obj/item/reagent_containers/food/drinks/bottle/soju{
pixel_x = 8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle/sake,
/obj/item/reagent_containers/food/drinks/bottle/soju{
pixel_x = 8
},
@@ -2359,7 +2334,6 @@
},
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/wood,
@@ -2716,7 +2690,6 @@
"ir" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/lino,
@@ -3340,7 +3313,6 @@
pixel_x = 2
},
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/lino,
@@ -3392,7 +3364,6 @@
/obj/item/material/hook,
/obj/item/device/synthesized_instrument/guitar,
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/lino,
@@ -3477,11 +3448,8 @@
/turf/simulated/floor/wood,
/area/point_verdant/interior/tunnels)
"kA" = (
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/reagent_containers/food/drinks/bottle{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle{
pixel_y = 0;
pixel_x = -10
},
/obj/structure/table/rack/retail_shelf,
@@ -3494,7 +3462,6 @@
"kC" = (
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/obj/structure/toilet{
@@ -4257,7 +4224,6 @@
"mG" = (
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/obj/structure/toilet{
@@ -4904,7 +4870,6 @@
/area/point_verdant/interior/tunnels)
"oQ" = (
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/obj/structure/closet/crate/bin,
@@ -4933,7 +4898,6 @@
dir = 8
},
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/lino/diamond,
@@ -4983,21 +4947,17 @@
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma,
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma,
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = 9
},
/turf/simulated/floor/tiled,
@@ -5146,7 +5106,6 @@
/obj/effect/decal/cleanable/cobweb2,
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/turf/simulated/floor/lino,
@@ -5169,13 +5128,12 @@
"pI" = (
/obj/structure/table/wood,
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/wood,
/area/point_verdant/interior/offices/kaf)
"pJ" = (
/obj/structure/stairs/urban,
/obj/structure/stairs/urban/north,
/turf/simulated/floor/wood,
/area/point_verdant/interior/hotel)
"pK" = (
@@ -5899,7 +5857,6 @@
},
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/obj/item/reagent_containers/food/drinks/bottle/pwine{
@@ -5969,7 +5926,6 @@
pixel_y = 11
},
/obj/item/storage/box/masks{
pixel_y = 0;
pixel_x = -9
},
/obj/item/storage/box/gloves{
@@ -6572,7 +6528,6 @@
/area/point_verdant/interior/tunnels)
"tX" = (
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/sidewalk/dark,
@@ -7160,7 +7115,6 @@
pixel_y = 11
},
/obj/item/storage/box/masks{
pixel_y = 0;
pixel_x = -9
},
/obj/item/storage/box/gloves{
@@ -7539,7 +7493,6 @@
"wW" = (
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/lino/diamond,
@@ -7651,7 +7604,6 @@
},
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/lino,
@@ -7938,7 +7890,6 @@
pixel_x = 1
},
/obj/item/trash/cigbutt{
pixel_y = 0;
pixel_x = 10
},
/obj/random/dirt_75,
@@ -8424,7 +8375,6 @@
/area/point_verdant/interior/tunnels)
"Ab" = (
/obj/machinery/door/blast/odin{
dir = 1;
id = "konyang_special_big"
},
/obj/effect/floor_decal/corner_wide/red/diagonal,
@@ -8741,9 +8691,7 @@
/turf/unsimulated/mineral/konyang,
/area/point_verdant/interior/tunnels)
"AX" = (
/obj/structure/bed/stool/chair{
dir = 2
},
/obj/structure/bed/stool/chair,
/turf/simulated/floor/sidewalk/dark,
/area/point_verdant/interior/offices/kaf)
"AY" = (
@@ -8806,7 +8754,6 @@
/area/point_verdant/interior/tunnels)
"Bh" = (
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/obj/structure/lattice/catwalk/indoor/urban,
@@ -8983,7 +8930,6 @@
/obj/item/storage/bag/trash,
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/lino,
@@ -9809,9 +9755,7 @@
/turf/simulated/floor/lino,
/area/point_verdant/interior/bar)
"En" = (
/obj/structure/bed/stool/chair/sofa/brown{
dir = 2
},
/obj/structure/bed/stool/chair/sofa/brown,
/turf/simulated/floor/wood,
/area/point_verdant/interior/bar)
"Eo" = (
@@ -10293,9 +10237,7 @@
/turf/simulated/floor/tiled/dark,
/area/point_verdant/interior/police)
"FE" = (
/obj/structure/bed/stool/chair/office/dark{
dir = 2
},
/obj/structure/bed/stool/chair/office/dark,
/turf/simulated/floor/tiled/white,
/area/point_verdant/interior/pharmacy)
"FH" = (
@@ -10314,7 +10256,6 @@
"FL" = (
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/obj/structure/toilet{
@@ -11081,7 +11022,6 @@
"HD" = (
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/obj/structure/toilet{
@@ -11616,7 +11556,6 @@
pixel_y = 3
},
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/obj/item/reagent_containers/food/drinks/bottle/hooch{
@@ -11827,9 +11766,7 @@
/turf/simulated/floor/carpet/darkblue,
/area/point_verdant/interior/police)
"JU" = (
/obj/structure/bed/stool/chair/office/dark{
dir = 2
},
/obj/structure/bed/stool/chair/office/dark,
/obj/random/dirt_75,
/turf/simulated/floor/lino,
/area/point_verdant/interior/police)
@@ -12111,7 +12048,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/lino,
@@ -12290,10 +12226,7 @@
/turf/simulated/floor/tiled/full,
/area/point_verdant/interior/hotel)
"LD" = (
/obj/structure/stairs/urban{
dir = 8;
icon_state = "stairs-right"
},
/obj/structure/stairs/urban/left,
/turf/simulated/floor/concrete,
/area/point_verdant/outdoors)
"LE" = (
@@ -12905,7 +12838,6 @@
"Ne" = (
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/obj/structure/lattice/catwalk/indoor/urban,
@@ -13155,7 +13087,6 @@
"NN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/colored/decayed{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/lino/diamond,
@@ -14003,10 +13934,7 @@
/turf/simulated/floor/exoplanet/water/shallow/sewage,
/area/point_verdant/sewer)
"Qm" = (
/obj/structure/stairs_lower/stairs_upper{
dir = 2;
pixel_y = 0
},
/obj/structure/stairs_lower/stairs_upper,
/turf/simulated/wall,
/area/point_verdant/interior/bar)
"Qn" = (
@@ -14486,15 +14414,11 @@
/turf/simulated/floor/tiled,
/area/point_verdant/interior/police)
"RA" = (
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/reagent_containers/food/drinks/bottle{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/bottle{
pixel_y = 0;
pixel_x = 10
},
/obj/item/reagent_containers/food/drinks/bottle{
pixel_y = 0;
pixel_x = -10
},
/obj/structure/table/rack/retail_shelf,
@@ -15098,7 +15022,6 @@
/obj/item/clothing/glasses/sunglasses/aviator,
/obj/item/clothing/suit/armor/carrier/military,
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/obj/item/clothing/shoes/jackboots,
@@ -15922,7 +15845,6 @@
/obj/structure/closet/crate/miningcart/ore,
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/turf/simulated/floor/lino,
@@ -16283,7 +16205,6 @@
"WD" = (
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/obj/structure/undies_wardrobe,
@@ -16432,7 +16353,6 @@
/area/point_verdant/interior/tunnels)
"Xb" = (
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/obj/machinery/photocopier/faxmachine,
@@ -16554,21 +16474,17 @@
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma,
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma,
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
@@ -16846,7 +16762,6 @@
/obj/structure/punching_bag,
/obj/machinery/light/colored/decayed{
dir = 4;
pixel_y = 0;
pixel_x = 10
},
/turf/simulated/floor/lino,
@@ -17133,7 +17048,6 @@
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/light/colored/decayed{
dir = 8;
pixel_y = 0;
pixel_x = -10
},
/turf/simulated/floor/lino/diamond,
@@ -53956,7 +53870,7 @@ rf
rf
IJ
vR
cR
LD
LD
rf
rf
@@ -293,7 +293,6 @@
/area/point_verdant/interior/hotel)
"aP" = (
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/obj/structure/flora/pottedplant/bamboo,
@@ -486,8 +485,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/water)
@@ -1581,7 +1579,6 @@
"et" = (
/obj/effect/floor_decal/corner_wide/mauve/full,
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -1713,31 +1710,24 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/stone/marble,
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/fries{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/burger/cheese{
@@ -2326,8 +2316,7 @@
/obj/structure/closet/crate/bin/urban/compact{
pixel_x = 7;
density = 0;
anchored = 0;
pixel_y = 0
anchored = 0
},
/turf/simulated/floor/wood,
/area/point_verdant/interior/cafe)
@@ -2419,8 +2408,7 @@
/area/point_verdant/outdoors)
"gN" = (
/obj/structure/stairs_railing{
dir = 8;
pixel_y = 0
dir = 8
},
/turf/simulated/floor/tiled,
/area/point_verdant/interior/offices)
@@ -2438,7 +2426,6 @@
"gP" = (
/obj/machinery/light/colored{
dir = 8;
pixel_y = 0;
pixel_x = -12
},
/obj/structure/flora/pottedplant/bamboo,
@@ -3292,9 +3279,7 @@
/obj/effect/floor_decal/corner_wide/grey{
dir = 4
},
/obj/effect/floor_decal/corner_wide/black{
dir = 2
},
/obj/effect/floor_decal/corner_wide/black,
/turf/simulated/floor/tiled,
/area/point_verdant/interior/offices)
"jo" = (
@@ -3578,8 +3563,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/outdoors)
@@ -3619,16 +3603,13 @@
pixel_y = 7
},
/obj/item/storage/pill_bottle/inaprovaline{
pixel_x = 6;
pixel_y = 0
pixel_x = 6
},
/obj/item/storage/pill_bottle/inaprovaline{
pixel_x = 6;
pixel_y = 0
pixel_x = 6
},
/obj/item/storage/pill_bottle/inaprovaline{
pixel_x = 6;
pixel_y = 0
pixel_x = 6
},
/obj/item/reagent_containers/glass/bottle/inaprovaline{
pixel_x = -7
@@ -3846,11 +3827,9 @@
pixel_x = 6
},
/obj/item/clothing/accessory/dressshirt{
pixel_y = 0;
pixel_x = 6
},
/obj/item/clothing/accessory/dressshirt{
pixel_y = 0;
pixel_x = 6
},
/obj/item/clothing/accessory/dressshirt{
@@ -4730,7 +4709,6 @@
"nd" = (
/obj/structure/table/standard,
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -5041,9 +5019,7 @@
/turf/simulated/floor/asphalt,
/area/point_verdant/outdoors)
"nQ" = (
/obj/structure/bed/stool/chair/office/dark{
dir = 2
},
/obj/structure/bed/stool/chair/office/dark,
/obj/effect/floor_decal/corner/blue{
dir = 10
},
@@ -5988,7 +5964,6 @@
dir = 4
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -6423,7 +6398,6 @@
/area/point_verdant/outdoors)
"rq" = (
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/obj/effect/floor_decal/corner/blue{
@@ -7694,7 +7668,6 @@
dir = 10
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -8055,12 +8028,10 @@
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma,
/obj/item/reagent_containers/food/drinks/cans/beer/rice/shimauma{
pixel_y = 0;
pixel_x = 9
},
/turf/simulated/floor/wood,
@@ -8182,7 +8153,6 @@
pixel_y = 10
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/sidewalk/flat,
@@ -8258,9 +8228,7 @@
/turf/simulated/floor/asphalt,
/area/point_verdant/outdoors)
"wd" = (
/obj/structure/window/reinforced{
dir = 2
},
/obj/structure/window/reinforced,
/obj/structure/table/wood,
/turf/simulated/floor/tiled,
/area/point_verdant/interior/police)
@@ -8933,8 +8901,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/exoplanet/water/shallow/konyang/no_smooth,
/area/point_verdant/water)
@@ -9001,7 +8968,6 @@
"yc" = (
/obj/machinery/light/colored{
dir = 8;
pixel_y = 0;
pixel_x = -12
},
/turf/simulated/floor/lino/diamond,
@@ -9055,7 +9021,6 @@
pixel_y = 9
},
/obj/item/storage/toolbox/electrical{
pixel_y = 0;
pixel_x = 2
},
/obj/machinery/light{
@@ -9324,12 +9289,6 @@
},
/turf/simulated/floor/exoplanet/konyang/no_edge,
/area/point_verdant/outdoors)
"yQ" = (
/obj/structure/stairs/urban{
dir = 1
},
/turf/simulated/floor/concrete,
/area/point_verdant/interior/shallow)
"yR" = (
/obj/structure/rod_railing,
/turf/simulated/floor/sidewalk,
@@ -9851,7 +9810,6 @@
pixel_y = 6
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -9910,7 +9868,6 @@
/obj/effect/decal/exterior_stairs/half,
/obj/machinery/door/window/southleft,
/obj/machinery/door/blast/shutters{
dir = 1;
id = "konyang_clinic"
},
/turf/simulated/floor/lino/diamond,
@@ -9953,15 +9910,6 @@
/obj/effect/map_effect/window_spawner/full/wood,
/turf/simulated/floor/tiled,
/area/point_verdant/interior/spaceport)
"Ar" = (
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
},
/turf/simulated/floor/exoplanet/water/konyang,
/area/point_verdant/water)
"As" = (
/obj/structure/konyang_cliff{
icon_state = "topcorner_east"
@@ -10282,15 +10230,11 @@
pixel_y = 13;
pixel_x = 9
},
/obj/item/reagent_containers/food/drinks/dry_ramen,
/obj/item/reagent_containers/food/drinks/dry_ramen{
pixel_y = 0
},
/obj/item/reagent_containers/food/drinks/dry_ramen{
pixel_y = 0;
pixel_x = -9
},
/obj/item/reagent_containers/food/drinks/dry_ramen{
pixel_y = 0;
pixel_x = 9
},
/obj/random/dirt_75,
@@ -10401,9 +10345,7 @@
/area/point_verdant/outdoors)
"Bw" = (
/obj/structure/table/rack/retail_shelf,
/obj/item/storage/box/fancy/donut{
pixel_y = 0
},
/obj/item/storage/box/fancy/donut,
/obj/item/storage/box/fancy/donut{
pixel_y = 5
},
@@ -10622,7 +10564,6 @@
dir = 10
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -10960,9 +10901,7 @@
/turf/simulated/floor/sidewalk,
/area/point_verdant/outdoors)
"Dc" = (
/obj/structure/bed/stool/chair/office/bridge/generic{
dir = 2
},
/obj/structure/bed/stool/chair/office/bridge/generic,
/turf/simulated/floor/tiled/full,
/area/point_verdant/interior/offices)
"Dd" = (
@@ -11282,7 +11221,6 @@
"DS" = (
/obj/effect/map_effect/window_spawner/full/reinforced/grille,
/obj/machinery/door/blast/shutters{
dir = 1;
id = "konyang_clinic"
},
/turf/simulated/floor/lino/diamond,
@@ -11624,7 +11562,6 @@
dir = 10
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -12300,7 +12237,6 @@
/obj/random/dirt_75,
/obj/machinery/light/colored{
dir = 4;
pixel_y = 0;
pixel_x = 12
},
/turf/simulated/floor/tiled,
@@ -13246,7 +13182,6 @@
/obj/effect/decal/exterior_stairs/half,
/obj/machinery/door/window/southright,
/obj/machinery/door/blast/shutters{
dir = 1;
id = "konyang_clinic"
},
/turf/simulated/floor/lino/diamond,
@@ -14397,14 +14332,9 @@
/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/outdoors)
"Ms" = (
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
},
/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/water)
/obj/structure/stairs/urban/left,
/turf/simulated/wall/wood,
/area/point_verdant/interior/hotel)
"Mt" = (
/obj/structure/table/standard,
/obj/item/folder/white{
@@ -14569,7 +14499,6 @@
},
/obj/machinery/light/colored{
dir = 4;
pixel_y = 0;
pixel_x = 12
},
/turf/simulated/floor/carpet/darkblue,
@@ -14598,9 +14527,7 @@
/obj/item/storage/firstaid/surgery{
pixel_y = 8
},
/obj/item/storage/firstaid/surgery{
pixel_y = 0
},
/obj/item/storage/firstaid/surgery,
/turf/simulated/floor/tiled/white,
/area/point_verdant/interior/pharmacy)
"MT" = (
@@ -14876,7 +14803,6 @@
pixel_y = 2
},
/obj/machinery/light{
dir = 2;
pixel_y = -2
},
/turf/simulated/floor/tiled,
@@ -15088,39 +15014,30 @@
/obj/random/dirt_75,
/obj/structure/closet/crate,
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy{
pixel_y = 0;
pixel_x = -5
},
/obj/item/reagent_containers/food/snacks/candy/koko{
@@ -15882,24 +15799,20 @@
"PR" = (
/obj/structure/table/rack/retail_shelf,
/obj/item/storage/pill_bottle/steramycin{
pixel_x = 8;
pixel_y = 0
pixel_x = 8
},
/obj/item/reagent_containers/glass/bottle/thetamycin,
/obj/item/storage/pill_bottle/steramycin{
pixel_x = -9;
pixel_y = 0
pixel_x = -9
},
/obj/item/storage/pill_bottle/steramycin{
pixel_x = 8;
pixel_y = 0
pixel_x = 8
},
/obj/item/reagent_containers/glass/bottle/thetamycin{
pixel_y = -6
},
/obj/item/storage/pill_bottle/steramycin{
pixel_x = -9;
pixel_y = 0
pixel_x = -9
},
/turf/simulated/floor/tiled/white,
/area/point_verdant/interior/pharmacy)
@@ -16006,8 +15919,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/asphalt,
/area/point_verdant/outdoors)
@@ -16141,8 +16053,7 @@
pixel_y = 8
},
/obj/item/reagent_containers/food/drinks/bottle/sake{
pixel_x = -6;
pixel_y = 0
pixel_x = -6
},
/obj/random/dirt_75,
/obj/random/dirt_75,
@@ -16166,7 +16077,6 @@
},
/obj/machinery/light/colored{
dir = 4;
pixel_y = 0;
pixel_x = 12
},
/turf/simulated/floor/tiled,
@@ -16456,8 +16366,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/obj/structure/structural_support/side,
/turf/simulated/floor/exoplanet/water/konyang,
@@ -17226,7 +17135,6 @@
"TC" = (
/obj/structure/stairs_railing{
dir = 4;
pixel_y = 0;
pixel_x = -32
},
/turf/simulated/floor/tiled,
@@ -17900,8 +17808,7 @@
/obj/effect/step_trigger/thrower{
icon_state = "dir_arrow";
tiles = 1;
dir = 4;
pixel_y = 0
dir = 4
},
/turf/simulated/floor/exoplanet/water/shallow/konyang,
/area/point_verdant/outdoors)
@@ -19090,7 +18997,7 @@
/turf/simulated/floor/wood,
/area/point_verdant/interior/offices)
"YI" = (
/obj/structure/stairs/urban,
/obj/structure/stairs/urban/south,
/turf/simulated/floor/wood,
/area/point_verdant/interior/hotel)
"YJ" = (
@@ -19439,8 +19346,7 @@
pixel_x = 5
},
/obj/machinery/ringer_button{
pixel_x = 9;
pixel_y = 0
pixel_x = 9
},
/turf/simulated/floor/carpet/red,
/area/point_verdant/interior/hotel)
@@ -19469,7 +19375,6 @@
/area/point_verdant/outdoors)
"ZM" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 4;
req_access = list(218)
},
/turf/simulated/floor/tiled,
@@ -25582,8 +25487,8 @@ az
az
az
pL
Ar
Ms
aJ
Ed
bm
VA
VA
@@ -25592,12 +25497,12 @@ VA
kc
xS
Ry
Ar
Ar
Ar
Ar
Ms
Ms
aJ
aJ
aJ
aJ
Ed
Ed
Op
az
ps
@@ -25835,9 +25740,9 @@ MA
az
az
pL
Ar
Ar
Ar
aJ
aJ
aJ
pL
MA
MA
@@ -26078,9 +25983,9 @@ az
az
az
az
Ar
Ar
Ar
aJ
aJ
aJ
az
az
az
@@ -26329,24 +26234,24 @@ az
az
az
pL
Ar
Ar
Ar
Ar
Ar
Ar
Ar
aJ
aJ
aJ
aJ
aJ
aJ
aJ
MA
Ar
Ar
Ar
Ar
Ar
Ms
Ms
Ms
Ms
Ms
aJ
aJ
aJ
aJ
aJ
Ed
Ed
Ed
Ed
Ed
zQ
MA
MA
@@ -33356,7 +33261,7 @@ iD
Aw
Aw
Aw
Aw
Ms
kV
iD
Aw
@@ -48530,7 +48435,7 @@ vJ
vJ
vJ
vJ
yQ
kz
su
su
su
@@ -48787,7 +48692,7 @@ vJ
vJ
vJ
vJ
yQ
kz
su
su
su