Various offsite fixes (VestaOfOrion#352)

* Fixes offsite scanners, adds hematite to surface deposits
SS13-Source-Archive · Mar 5, 2021 · 0745ef8 · 0745ef8
1 parent 6d1d292
commit 0745ef8
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 105 deletions.
diff --git a/code/modules/materials/materials_ore.dm b/code/modules/materials/materials_ore.dm
@@ -77,3 +77,5 @@
 	..(newloc, MATERIAL_BAUXITE)
 /obj/item/weapon/ore/rutile/New(var/newloc)
 	..(newloc, MATERIAL_RUTILE)
+/obj/item/weapon/ore/hematite/New(var/newloc)
+	..(newloc, MATERIAL_HEMATITE)
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
@@ -31,6 +31,7 @@
 		MATERIAL_OSMIUM =   /obj/item/weapon/ore/osmium,
 		MATERIAL_HYDROGEN = /obj/item/weapon/ore/hydrogen,
 		MATERIAL_SAND =     /obj/item/weapon/ore/glass,
+		MATERIAL_HEMATITE = /obj/item/weapon/ore/hematite,
 		MATERIAL_GRAPHITE = /obj/item/weapon/ore/coal,
 		MATERIAL_ALUMINIUM = /obj/item/weapon/ore/aluminium,
 		MATERIAL_RUTILE = /obj/item/weapon/ore/rutile

diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm
@@ -150,6 +150,7 @@
 			color = E.grass_color
 	if(!resources)
 		resources = list()
+		resources[MATERIAL_HEMATITE] = 2
 	if(prob(70))
 		resources[MATERIAL_GRAPHITE] = rand(3,5)
 	if(prob(5))

diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm
@@ -62,8 +62,9 @@
 			TRANSLATE_AND_VERIFY_COORD(x, y)
 
 			if(tmp_cell < rare_val)      // Surface metals.
+				T.resources[MATERIAL_HEMATITE] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
 				T.resources[MATERIAL_IRON] =     rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
-				T.resources[MATERIAL_ALUMINIUM] =     rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
+				T.resources[MATERIAL_ALUMINIUM] =rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources[MATERIAL_GOLD] =     rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources[MATERIAL_SILVER] =   rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources[MATERIAL_URANIUM] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
@@ -73,6 +74,7 @@
 				T.resources[MATERIAL_OSMIUM] =   0
 				T.resources[MATERIAL_HYDROGEN] = 0
 			else if(tmp_cell < deep_val) // Rare metals.
+				T.resources[MATERIAL_HEMATITE] = rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources[MATERIAL_GOLD] =     rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources[MATERIAL_SILVER] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources[MATERIAL_URANIUM] =  rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
@@ -83,6 +85,7 @@
 				T.resources[MATERIAL_DIAMOND] =  0
 				T.resources[MATERIAL_IRON] =     0
 			else                             // Deep metals.
+				T.resources[MATERIAL_HEMATITE] = rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources[MATERIAL_URANIUM] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources[MATERIAL_DIAMOND] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources[MATERIAL_PHORON] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)

diff --git a/html/changelogs/Slywater-PR-352.yml b/html/changelogs/Slywater-PR-352.yml
@@ -0,0 +1,39 @@
+################################
+# 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
+#   admin
+#################################
+
+# Your name.  
+author: Slywater
+
+# 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: 
+  - tweak: "Hematite can now be mined in planetary surface deposits."
+  - rscadd: "Added condiments to bearcat and colonies."
+  - bugfix: "Added scanner consoles to colony body scanners."
diff --git a/maps/away/bearcat/bearcat-2.dmm b/maps/away/bearcat/bearcat-2.dmm
@@ -40,6 +40,37 @@
 	},
 /turf/simulated/floor,
 /area/ship/scrap/command/bridge)
+"ae" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/item/weapon/reagent_containers/glass/beaker{
+	pixel_x = 5
+	},
+/obj/item/weapon/book/manual/chef_recipes,
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{
+	pixel_x = 3
+	},
+/obj/item/weapon/reagent_containers/food/condiment/enzyme,
+/obj/item/weapon/reagent_containers/glass/rag,
+/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
+/turf/simulated/floor/tiled,
+/area/ship/scrap/crew/kitchen)
+"af" = (
+/obj/structure/closet/medical_wall{
+	name = "pill cabinet";
+	pixel_x = 26
+	},
+/obj/item/weapon/storage/pill_bottle/antidexafen,
+/obj/item/weapon/storage/pill_bottle/tramadol,
+/obj/item/weapon/storage/pill_bottle/antitox,
+/obj/item/weapon/storage/pill_bottle/kelotane,
+/obj/machinery/body_scanconsole{
+	dir = 1
+	},
+/obj/structure/iv_drip,
+/turf/simulated/floor/tiled/white,
+/area/ship/scrap/crew/medbay)
 "ag" = (
 /obj/machinery/computer/modular/preset/cardslot/command,
 /turf/simulated/floor/bluegrid/airless,
@@ -2074,20 +2105,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/ship/scrap/crew/kitchen)
-"dT" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/weapon/reagent_containers/glass/beaker{
-	pixel_x = 5
-	},
-/obj/item/weapon/book/manual/chef_recipes,
-/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{
-	pixel_x = 3
-	},
-/obj/item/weapon/reagent_containers/food/condiment/enzyme,
-/obj/item/weapon/reagent_containers/glass/rag,
-/turf/simulated/floor/tiled,
-/area/ship/scrap/crew/kitchen)
 "dU" = (
 /obj/item/weapon/stool/padded,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2217,18 +2234,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/ship/scrap/crew/medbay)
-"eg" = (
-/obj/structure/iv_drip,
-/obj/structure/closet/medical_wall{
-	name = "pill cabinet";
-	pixel_x = 26
-	},
-/obj/item/weapon/storage/pill_bottle/antidexafen,
-/obj/item/weapon/storage/pill_bottle/tramadol,
-/obj/item/weapon/storage/pill_bottle/antitox,
-/obj/item/weapon/storage/pill_bottle/kelotane,
-/turf/simulated/floor/tiled/white,
-/area/ship/scrap/crew/medbay)
 "eh" = (
 /obj/effect/paint/brown,
 /turf/simulated/wall/r_wall,
@@ -12765,7 +12770,7 @@ cR
 di
 dw
 dE
-dT
+ae
 ej
 eE
 eY
@@ -14717,7 +14722,7 @@ dg
 oa
 dB
 dQ
-eg
+af
 ey
 eQ
 dB

diff --git a/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm b/maps/random_ruins/exoplanet_ruins/playablecolony/colony.dmm
@@ -1013,6 +1013,24 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/map_template/colony/medbay)
+"cd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/corner/red{
+	dir = 6
+	},
+/obj/machinery/body_scanconsole,
+/turf/simulated/floor/tiled/white,
+/area/map_template/colony/medbay)
 "ce" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /obj/machinery/atmospherics/unary/outlet_injector{
@@ -2256,22 +2274,39 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/map_template/colony/atmospherics)
 "ez" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/red{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/white,
-/area/map_template/colony/medbay)
+/obj/structure/closet/crate/freezer,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/random/drinkbottle,
+/obj/item/weapon/storage/lunchbox/syndicate/filled,
+/obj/item/weapon/storage/lunchbox/cat/filled,
+/obj/item/weapon/storage/lunchbox/nt/filled,
+/obj/item/weapon/storage/lunchbox/nymph/filled,
+/obj/item/pizzabox/meat,
+/obj/item/pizzabox/margherita,
+/obj/item/pizzabox/mushroom,
+/obj/item/pizzabox/vegetable,
+/obj/item/weapon/storage/box/cola/spaceup,
+/obj/item/weapon/storage/box/cola/spacewind,
+/obj/item/weapon/storage/box/cola/icedtea,
+/obj/item/weapon/storage/box/cola/drgibb,
+/obj/item/weapon/reagent_containers/food/drinks/shaker,
+/obj/item/weapon/reagent_containers/food/drinks/pitcher,
+/obj/item/weapon/reagent_containers/glass/beaker/bowl,
+/obj/item/weapon/reagent_containers/food/condiment/salt,
+/obj/item/weapon/reagent_containers/food/condiment/enzyme,
+/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
+/turf/simulated/floor/tiled/freezer,
+/area/map_template/colony/messhall)
 "eA" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 1;
@@ -3334,37 +3369,6 @@
 /obj/machinery/door/airlock/civilian,
 /turf/simulated/floor/lino,
 /area/map_template/colony/messhall)
-"ge" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/structure/closet/crate/freezer,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/random/drinkbottle,
-/obj/item/weapon/storage/lunchbox/syndicate/filled,
-/obj/item/weapon/storage/lunchbox/cat/filled,
-/obj/item/weapon/storage/lunchbox/nt/filled,
-/obj/item/weapon/storage/lunchbox/nymph/filled,
-/obj/item/pizzabox/meat,
-/obj/item/pizzabox/margherita,
-/obj/item/pizzabox/mushroom,
-/obj/item/pizzabox/vegetable,
-/obj/item/weapon/storage/box/cola/spaceup,
-/obj/item/weapon/storage/box/cola/spacewind,
-/obj/item/weapon/storage/box/cola/icedtea,
-/obj/item/weapon/storage/box/cola/drgibb,
-/obj/item/weapon/reagent_containers/food/drinks/shaker,
-/obj/item/weapon/reagent_containers/food/drinks/pitcher,
-/obj/item/weapon/reagent_containers/glass/beaker/bowl,
-/obj/item/weapon/reagent_containers/food/condiment/salt,
-/obj/item/weapon/reagent_containers/food/condiment/enzyme,
-/turf/simulated/floor/tiled/freezer,
-/area/map_template/colony/messhall)
 "gf" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10;
@@ -10196,7 +10200,7 @@ gb
 gI
 hx
 aI
-ge
+ez
 dk
 aI
 iR
@@ -10311,7 +10315,7 @@ dn
 eZ
 au
 dW
-ez
+cd
 ea
 aB
 fu