Skip to content

Commit

Permalink
Ranch tiles can now be removed/replaced (#1485)
Browse files Browse the repository at this point in the history 
* Freerunning quirk fixes

* Fix for #1330

* fix for #1263

* adds open state icons for nanite programmer and nanite program hub

* reopening develop branch

* examine gives the mobs species

* Fix for #1382

* [no gbp] gutlunch pop control (tgstation#79772)

* Sandy dirt station floor tile

---------

Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
  • Loading branch information
@AlbertNanotracen @Ben10Omintrix
AlbertNanotracen and Ben10Omintrix committed Mar 28, 2024
1 parent d7837c6 commit df28ff7
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 51 deletions.
36 changes: 18 additions & 18 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8601,7 +8601,7 @@
/obj/structure/railing{
dir = 4
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"bWT" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -10224,7 +10224,7 @@
/area/station/engineering/atmos/hfr_room)
"crb" = (
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"crd" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -12548,7 +12548,7 @@
/area/station/ai_monitored/security/armory)
"cVt" = (
/obj/structure/railing,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"cVx" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
Expand Down Expand Up @@ -19246,7 +19246,7 @@
"eGr" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/light/directional/east,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"eGs" = (
/obj/structure/chair/office{
Expand Down Expand Up @@ -20908,7 +20908,7 @@
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"fam" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -23009,7 +23009,7 @@
"fzD" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/railing,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"fzF" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -28028,7 +28028,7 @@
/turf/open/floor/iron/large,
/area/station/commons/locker)
"gKu" = (
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"gKA" = (
/obj/structure/cable,
Expand Down Expand Up @@ -35339,7 +35339,7 @@
/obj/structure/window/reinforced/spawner/directional/south,
/obj/structure/nestbox,
/mob/living/basic/chicken,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"iBf" = (
/obj/structure/cable,
Expand Down Expand Up @@ -41169,7 +41169,7 @@
"jVg" = (
/obj/machinery/airalarm/directional/north,
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"jVx" = (
/obj/machinery/computer/crew{
Expand Down Expand Up @@ -41575,7 +41575,7 @@
/area/station/ai_monitored/turret_protected/aisat_interior)
"kaw" = (
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"kax" = (
/obj/structure/chair/office/light{
Expand Down Expand Up @@ -42670,7 +42670,7 @@
/obj/structure/railing{
dir = 8
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"kmE" = (
/obj/machinery/door/poddoor/incinerator_atmos_aux,
Expand Down Expand Up @@ -45001,7 +45001,7 @@
"kSi" = (
/obj/structure/nestbox,
/obj/machinery/light/directional/west,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"kSk" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -51841,7 +51841,7 @@
"mBG" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/nestbox,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"mBQ" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -55783,7 +55783,7 @@
/area/station/maintenance/fore)
"nzA" = (
/mob/living/basic/chicken,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"nzD" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -76560,7 +76560,7 @@
"sGm" = (
/obj/structure/window/reinforced/spawner/directional/north,
/mob/living/basic/chicken/brown,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"sGx" = (
/obj/structure/cable,
Expand Down Expand Up @@ -77033,7 +77033,7 @@
/obj/structure/railing{
dir = 8
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"sLd" = (
/obj/structure/cable,
Expand Down Expand Up @@ -80405,7 +80405,7 @@
"tCH" = (
/obj/machinery/light/directional/west,
/mob/living/basic/chicken/brown,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"tCI" = (
/obj/machinery/telecomms/server/presets/command,
Expand Down Expand Up @@ -90520,7 +90520,7 @@
/obj/structure/railing{
dir = 4
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"vZV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down
30 changes: 15 additions & 15 deletions _maps/map_files/MetaStation/MetaStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3199,7 +3199,7 @@
dir = 1
},
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"bep" = (
/obj/machinery/air_sensor/oxygen_tank,
Expand Down Expand Up @@ -4852,7 +4852,7 @@
"bJs" = (
/obj/machinery/light/directional/south,
/obj/structure/window/reinforced/spawner/directional/west,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"bJQ" = (
/obj/machinery/vending/coffee,
Expand Down Expand Up @@ -6246,7 +6246,7 @@
/obj/structure/railing{
dir = 1
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"cqk" = (
/obj/structure/cable,
Expand Down Expand Up @@ -17176,7 +17176,7 @@
/area/station/engineering/atmos)
"gxn" = (
/obj/structure/nestbox,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"gxx" = (
/obj/machinery/door/airlock/atmos/glass{
Expand Down Expand Up @@ -19431,7 +19431,7 @@
/turf/open/floor/iron/white,
/area/station/security/prison/mess)
"hmM" = (
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"hne" = (
/obj/machinery/door/window/brigdoor{
Expand Down Expand Up @@ -21879,7 +21879,7 @@
"igX" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/nestbox,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"igZ" = (
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -24561,7 +24561,7 @@
/obj/structure/railing{
dir = 1
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"iVi" = (
/obj/machinery/door/airlock{
Expand Down Expand Up @@ -25619,7 +25619,7 @@
"jop" = (
/obj/machinery/light/directional/south,
/obj/structure/nestbox,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"joq" = (
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -35106,7 +35106,7 @@
/obj/structure/railing{
dir = 1
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"mFC" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -45326,7 +45326,7 @@
"qkV" = (
/obj/structure/window/reinforced/spawner/directional/west,
/mob/living/basic/chicken,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"qkW" = (
/obj/machinery/light/directional/south,
Expand Down Expand Up @@ -47969,7 +47969,7 @@
"rhV" = (
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/sign/poster/random/directional/south,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"riz" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
Expand Down Expand Up @@ -57753,7 +57753,7 @@
/obj/structure/railing{
dir = 1
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"uAM" = (
/obj/structure/cable,
Expand Down Expand Up @@ -59959,7 +59959,7 @@
/obj/structure/railing{
dir = 1
},
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"vpg" = (
/obj/machinery/door/poddoor/preopen{
Expand Down Expand Up @@ -65601,7 +65601,7 @@
/area/station/engineering/atmos)
"xpk" = (
/mob/living/basic/chicken/brown,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"xpo" = (
/turf/open/floor/carpet,
Expand Down Expand Up @@ -66403,7 +66403,7 @@
c_tag = "Hydroponics - Aft"
},
/mob/living/basic/chicken,
/turf/open/misc/sandy_dirt,
/turf/open/floor/sandy_dirt,
/area/station/service/hydroponics)
"xDD" = (
/obj/effect/turf_decal/stripes/red/line{
Expand Down
Loading

0 comments on commit df28ff7

Please sign in to comment.