Survey scanner

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -725,6 +725,20 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"cQ" = (
+/obj/structure/filingcabinet/double{
+	pixel_x = 6
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/blue{
+	dir = 8
+	},
+/obj/item/storage/pill_bottle/mannitol{
+	pixel_x = 14;
+	pixel_y = -6
+	},
+/obj/item/storage/wallet/random,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "cX" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -1452,31 +1466,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
-"gb" = (
-/obj/structure/closet/wall/orange/directional/north{
-	name = "Chief Engineer's Locker"
-	},
-/obj/item/clothing/under/rank/engineering/chief_engineer,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/storage/backpack/industrial,
-/obj/item/clothing/head/beret/ce,
-/obj/item/clothing/glasses/meson/engine,
-/obj/item/clothing/shoes/workboots{
-	pixel_y = -7
-	},
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/radio/headset/heads/ce,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/item/pipe_dispenser{
-	pixel_y = -10
-	},
-/obj/item/storage/belt/utility/chief/full{
-	pixel_y = -11;
-	pixel_x = 9
-	},
-/obj/item/gun/energy/plasmacutter,
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
 "gd" = (
 /obj/structure/railing{
 	dir = 4;
@@ -1674,6 +1663,28 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/ship/hangar)
+"gT" = (
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/under/rank/engineering/engineer/nt,
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/head/welding,
+/obj/item/clothing/head/hardhat/weldhat,
+/obj/item/clothing/suit/toggle/hazard,
+/obj/item/storage/backpack/industrial,
+/obj/item/clothing/head/beret/eng/hazard,
+/obj/item/clothing/glasses/meson/engine,
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Engineering locker"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/belt/utility/full/engi{
+	pixel_y = -10;
+	pixel_x = 5
+	},
+/obj/item/gun/energy/plasmacutter,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering)
 "gY" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -4264,6 +4275,49 @@
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering)
+"pP" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/item/clothing/glasses/hud/diagnostic{
+	pixel_y = 5;
+	pixel_x = 5
+	},
+/obj/item/survey_handheld{
+	pixel_x = -2
+	},
+/obj/item/book/manual/wiki/robotics{
+	pixel_y = -1;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/merge_conflict_marker{
+	name = "---Merge Conflict Marker---",desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+	},
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/item/clothing/glasses/hud/diagnostic{
+	pixel_y = 5;
+	pixel_x = 5
+	},
+/obj/item/book/manual/wiki/robotics_cyborgs{
+	pixel_y = -1;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ship/science/robotics)
 "pQ" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "heron_sm_lockdown";
@@ -6452,29 +6506,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
-"xB" = (
-/obj/structure/table/reinforced,
-/obj/item/flashlight/lamp{
-	pixel_x = -4;
-	pixel_y = 10
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
-	},
-/obj/item/clothing/glasses/hud/diagnostic{
-	pixel_y = 5;
-	pixel_x = 5
-	},
-/obj/item/survey_handheld{
-	pixel_x = -2
-	},
-/obj/item/book/manual/wiki/robotics{
-	pixel_y = -1;
-	pixel_x = 5
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
-/area/ship/science/robotics)
 "xC" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
@@ -9435,6 +9466,31 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"IU" = (
+/obj/structure/closet/wall/orange/directional/north{
+	name = "Chief Engineer's Locker"
+	},
+/obj/item/clothing/under/rank/engineering/chief_engineer,
+/obj/item/clothing/suit/toggle/hazard,
+/obj/item/storage/backpack/industrial,
+/obj/item/clothing/head/beret/ce,
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/shoes/workboots{
+	pixel_y = -7
+	},
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/radio/headset/heads/ce,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/pipe_dispenser{
+	pixel_y = -10
+	},
+/obj/item/storage/belt/utility/chief/full{
+	pixel_y = -11;
+	pixel_x = 9
+	},
+/obj/item/gun/energy/plasmacutter,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering)
 "IY" = (
 /turf/closed/wall/r_wall,
 /area/ship/engineering/electrical)
@@ -9942,21 +9998,6 @@
 	initial_gas_mix = "o2=22;n2=82;TEMP=293.15"
 	},
 /area/ship/engineering/communications)
-"Lh" = (
-/obj/structure/filingcabinet/double{
-	pixel_x = 6
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/blue{
-	dir = 8
-	},
-/obj/item/storage/pill_bottle/mannitol{
-	pixel_x = 14;
-	pixel_y = -6
-	},
-/obj/item/storage/wallet/random,
-/obj/item/survey_handheld,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
 "Ll" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
@@ -10632,28 +10673,6 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hangar)
-"Ny" = (
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/under/rank/engineering/engineer/nt,
-/obj/item/clothing/glasses/meson/engine,
-/obj/item/clothing/head/welding,
-/obj/item/clothing/head/hardhat/weldhat,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/storage/backpack/industrial,
-/obj/item/clothing/head/beret/eng/hazard,
-/obj/item/clothing/glasses/meson/engine,
-/obj/structure/closet/wall/orange/directional/north{
-	name = "Engineering locker"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/belt/utility/full/engi{
-	pixel_y = -10;
-	pixel_x = 5
-	},
-/obj/item/gun/energy/plasmacutter,
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering)
 "NC" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 8
@@ -14126,7 +14145,7 @@
 KF
 wV
 UJ
-xB
+pP
 ot
 nQ
 nQ
@@ -14153,7 +14172,7 @@
 LY
 He
 hr
-Ny
+gT
 ht
 AA
 vI
@@ -14192,7 +14211,7 @@
 RC
 Oy
 hr
-gb
+IU
 Gp
 oA
 yu
@@ -15874,7 +15893,7 @@
 wD
 xb
 SI
-Lh
+cQ
 vp
 tA
 qc

code/datums/action.dm

@@ -249,6 +249,9 @@
 /datum/action/item_action/toggle_mister
 	name = "Toggle Mister"
 
+/datum/action/item_action/toggle_attachment
+	name = "Toggle Attachment"
+
 /datum/action/item_action/activate_injector
 	name = "Activate Injector"
 

code/datums/mapgen/planetary/BeachGenerator.dm

@@ -113,6 +113,11 @@
 	)
 	mob_spawn_chance = 1
 
+	feature_spawn_chance = 0.2
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
+
 /datum/biome/grass/dense
 	flora_spawn_chance = 70
 	mob_spawn_list = list(
@@ -122,7 +127,6 @@
 		/mob/living/simple_animal/hostile/poison/bees = 3,
 	)
 	mob_spawn_chance = 2
-	feature_spawn_chance = 0.1
 
 /datum/biome/beach
 	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/lit = 1)
@@ -136,6 +140,10 @@
 		/obj/item/toy/seashell = 1,
 	)
 	flora_spawn_chance = 5
+	feature_spawn_chance = 0.2
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
 
 /datum/biome/beach/dense
 	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense/lit = 1)
@@ -156,6 +164,10 @@
 		/obj/structure/flora/ash/garden/seaweed = 1
 	)
 	flora_spawn_chance = 1
+	feature_spawn_chance = 1
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
 
 /datum/biome/ocean/deep
 	open_turf_types = list(/turf/open/water/beach/deep = 1)
@@ -170,6 +182,10 @@
 		/mob/living/simple_animal/hostile/bear/cave = 5,
 		/mob/living/simple_animal/hostile/asteroid/lobstrosity/beach = 1,
 	)
+	feature_spawn_chance = 1
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
 
 /datum/biome/cave/beach/cove
 	open_turf_types = list(/turf/open/floor/plating/asteroid/sand/dense = 1)

code/datums/mapgen/planetary/JungleGenerator.dm

@@ -103,6 +103,11 @@
 		/obj/effect/spawner/lootdrop/chicken/jungle/flock = 1
 		)
 
+	feature_spawn_chance = 0.3
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
+
 /datum/biome/jungle/dense
 	flora_spawn_chance = 100
 	open_turf_types = list(/turf/open/floor/plating/grass/jungle/lit = 1, /turf/open/floor/plating/dirt/jungle/dark/lit = 9)
@@ -146,9 +151,17 @@
 	flora_spawn_chance = 20
 	mob_spawn_chance = 0.05
 	mob_spawn_list = list(/mob/living/simple_animal/hostile/poison/giant_spider/tarantula = 1)
+	feature_spawn_chance = 0.3
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
 
 /datum/biome/jungle_wasteland
 	open_turf_types = list(/turf/open/floor/plating/dirt/jungle/wasteland/lit = 1)
+	feature_spawn_chance = 1
+	feature_spawn_list = list(
+		/obj/effect/survey_point = 1
+	)
 
 /datum/biome/jungle/water
 	open_turf_types = list(/turf/open/water/jungle/lit = 1)
@@ -177,10 +190,11 @@
 		/mob/living/simple_animal/hostile/retaliate/bat = 1,
 		/mob/living/simple_animal/hostile/retaliate/poison/snake = 1
 	)
-	feature_spawn_chance = 0.5
+	feature_spawn_chance = 1
 	feature_spawn_list = list(
 		/obj/item/pickaxe/rusted = 1,
 		/obj/structure/spawner/burrow/jungle_planet = 1,
+		/obj/effect/survey_point = 1,
 		/obj/effect/spawner/lootdrop/anomaly/jungle = 1
 	)
 
@@ -240,5 +254,8 @@
 	mob_spawn_list = list(
 		/mob/living/simple_animal/hostile/lightgeist = 1
 	)
-	feature_spawn_chance = 0.1
-	feature_spawn_list = list(/obj/item/rod_of_asclepius = 1)
+	feature_spawn_chance = 2
+	feature_spawn_list = list(
+		/obj/item/rod_of_asclepius = 1,
+		/obj/effect/survey_point = 100
+	)