Merge pull request #12593 from Very-Soft/gbtweaks

Some things that were forgotten

code/modules/planet/virgo3c_vr.dm

@@ -546,6 +546,10 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark)
 VIRGO3C_TURF_CREATE(/turf/simulated/mineral)
 VIRGO3C_TURF_CREATE(/turf/simulated/floor)
 
+/turf/simulated/mineral/floor/virgo3c
+	VIRGO3C_SET_ATMOS
+	outdoors = 0
+
 /turf/simulated/floor/outdoors/grass/virgo3c
 	VIRGO3C_SET_ATMOS
 

maps/groundbase/gb-mining.dmm

@@ -1,23 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/unsimulated/wall/planetary/virgo3c,
-/area/gb_mine/unexplored)
+/area/groundbase/mining/unexplored)
 "o" = (
 /obj/effect/step_trigger/teleporter/from_mining{
 	pixel_y = -16
 	},
 /turf/simulated/mineral/floor/ignore_mapgen,
-/area/gb_mine/unexplored)
-"v" = (
-/obj/effect/step_trigger/teleporter/from_mining,
-/turf/simulated/mineral/cave/virgo3c,
-/area/gb_mine/unexplored)
+/area/groundbase/mining/unexplored)
 "I" = (
-/turf/simulated/mineral/cave/virgo3c,
-/area/gb_mine/unexplored)
+/turf/simulated/mineral/cave/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/mining/unexplored)
 "Z" = (
 /turf/simulated/mineral/floor/ignore_mapgen,
-/area/gb_mine/unexplored)
+/area/groundbase/mining/unexplored)
 
 (1,1,1) = {"
 a
@@ -1985,8 +1983,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -2127,7 +2125,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -2270,7 +2268,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -2412,7 +2410,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -2553,7 +2551,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -2695,8 +2693,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -5338,8 +5336,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -5480,7 +5478,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -5623,7 +5621,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -5765,7 +5763,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -5906,7 +5904,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -6048,8 +6046,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -10255,8 +10253,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -10397,7 +10395,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -10540,7 +10538,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -10682,7 +10680,7 @@ Z
 Z
 Z
 o
-I
+Z
 I
 I
 I
@@ -10823,7 +10821,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -10965,8 +10963,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -17288,8 +17286,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I
@@ -17430,7 +17428,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -17572,8 +17570,8 @@ I
 Z
 Z
 Z
+o
 Z
-v
 I
 I
 I
@@ -17714,8 +17712,8 @@ I
 Z
 Z
 Z
+o
 Z
-v
 I
 I
 I
@@ -17856,7 +17854,7 @@ I
 I
 Z
 Z
-Z
+I
 I
 I
 I
@@ -17998,8 +17996,8 @@ I
 I
 I
 Z
-I
-I
+Z
+Z
 I
 I
 I

maps/groundbase/gb-z3.dmm

@@ -1156,6 +1156,13 @@
 /obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/cargo/office)
+"yZ" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/obj/random/vendorall,
+/turf/simulated/floor/tiled/virgo3c,
+/area/groundbase/medical/patio)
 "zb" = (
 /obj/structure/cable/yellow{
 	icon_state = "32-8"
@@ -1650,16 +1657,10 @@
 	pixel_x = 6;
 	pixel_y = -4
 	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 4
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/effect/floor_decal/corner/green/border{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -15471,7 +15472,7 @@ IS
 IS
 IS
 Hx
-qT
+yZ
 xp
 xX
 xX
@@ -15613,7 +15614,7 @@ IS
 IS
 IS
 Hx
-qT
+yZ
 OD
 HI
 xX

maps/groundbase/groundbase_areas.dm

@@ -5,6 +5,7 @@
 	requires_power = TRUE
 	dynamic_lighting = TRUE
 	ambience = AMBIENCE_MAINTENANCE
+	base_turf = /turf/simulated/mineral/floor/virgo3c
 
 /area/maintenance/groundbase
 	name = "Maintenance"
@@ -13,7 +14,7 @@
 	flags = RAD_SHIELDED
 	ambience = AMBIENCE_MAINTENANCE
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
-
+	base_turf = /turf/simulated/mineral/floor/virgo3c
 
 /area/groundbase/level1
 	name = "Rascal's Pass Level 1"
@@ -200,6 +201,8 @@
 	name = "Medical Patient Room 3"
 /area/groundbase/medical/patient4
 	name = "Medical Patient Room 4"
+/area/groundbase/medical/morgue
+	name = "Morgue"
 
 /area/groundbase/engineering
 	name = "Engineering"
@@ -271,6 +274,11 @@
 	name = "Gateway"
 /area/groundbase/civilian/janitor
 	name = "Janitor's Closet"
+/area/groundbase/civilian/foodplace
+	name = "Uncle Grumslex's Snack Emporium"
+/area/groundbase/civilian/apparel
+	name = "Crew Apparel Care"
+
 
 /area/groundbase/exploration
 	name = "Exploration"
@@ -328,3 +336,8 @@
 	name = "\improper Level 1 South Tunnel"
 /area/maintenance/groundbase/level1/swtunnel
 	name = "\improper Level 1 Southwest Tunnel"
+
+/area/groundbase/mining/unexplored
+	name = "Mining"
+/area/groundbase/mining/explored
+	name = "Mining"

maps/groundbase/groundbase_defines.dm

@@ -456,3 +456,100 @@
 	teleport_x = x
 	teleport_y = y --
 	teleport_z = Z_LEVEL_GB_BOTTOM
+
+/obj/item/weapon/book/manual/rotary_electric_generator
+	name = "Rotary Electric Generator Manual"
+	icon_state ="bookParticleAccelerator"
+	item_state = "book15"
+	author = "Engineering Encyclopedia"
+	title = "Rotary Electric Generator Manual"
+
+/obj/item/weapon/book/manual/rotary_electric_generator/New()
+	..()
+	dat = {"<html>
+				<head>
+				<style>
+				h1 {font-size: 18px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
+				h3 {font-size: 13px; margin: 15px 0px 5px;}
+				li {margin: 2px 0px 2px 15px;}
+				ul {margin: 5px; padding: 0px;}
+				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
+				</style>
+				</head>
+				<body>
+
+				Technical Order (TO) 1-33-34-2 <br>
+				 <h1>Operator's Manual - Rotary Electric Generator, D-Type</h1><br><br>
+
+				 Supporting Data: <br>
+				 - TO 1-33-34-4-1    Illustrated Parts Breakdown - Rotary Electric Generator, D-Type <br>
+				 - TO 1-33-34-6        Inspection Work Cards - Rotary Electric Generator, D-Type <br><br>
+
+				 Support Equipment: <br>
+				 - Torque Wrench, 100-80,000 inch-pounds <br>
+				 - Composite Tool Kit, Standard <br>
+				 - Multitool with Lead Kit, Wire Kit <br> <br>
+
+				 Required Supplies: <br>
+				 - stainless steel, 10,000cm3 <br>
+				 - lubrication, petrolatum, 6000ml <br>
+				 - electrical wiring, 5m <br>
+				 - component set, capacitors (any grade) <br>
+				 - circuitry board, REG <br> <br> 
+
+
+ 				<h1>SETUP AND OPERATING PROCEDURES</h1> <br> <br>
+
+ 				Setup: <br> <br>
+
+           			 CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects. <br> <br>
+
+    				1. Prepare setup area. Remove machinery, debris, foreign objects, people, and extra air. <br> <br>
+    
+    				2. Lay out preliminary electrical wiring. <br>
+    				 2a. Connect electrical wiring to existing facility power grid. <br>
+    				 2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6. <br>
+    
+    				3. Prepare gathered steel supplies as defined in TO 1-33-34-4-1 Figure 2 Index 3. <br>
+    
+    				4. Assemble prepared steel supplies into equipment framework by inserting rod A into slot B. Refer to TO 1-33-34-4-1 Figure 1 Index 1 for technical drawings. <br>
+    				 4a. Secure assembled equipment framework to flooring by tightening lower frame bolts. <br> <br>
+    
+    				5. Install and secure circuitry board, REG-D into marked receptacle. <br> <br>
+    
+    				6. Install electrical wiring. Refer to TO 1-33-34-4-1 Figure 666 Index 6 thru Index 90 for routing. <br> <br>
+    
+    				7. Install capacitors into marked circuitry board slots. Do not force components into place, use even pressure. Do not use a hammer. <br> <br>
+    
+    				        <b>WARNING</b>: Assembly will rapidly inflate when finalization is triggered. Ensure personnel and equipment are clear before initiating. <br> <br>
+    
+    				8. Finalize construction by turning the Initialize Finalization screw on the outer housing. <br> <br>
+    
+    				9. Wait for assembly to finish inflating, and the unit is ready for service. <br> <br>
+    
+
+ 				Operating Procedures: <br> <br>
+
+    				    NOTE: Operation of REG-D type generators requires significant physical effort. Ensure users are provided adequare nutrition and hydration throughout the working period. <br> <br>
+        
+    					1. Designate the individual who will be operating the REG-D. <br> <br>
+    
+    					2. Provide a safety briefing regarding nutritional preparedness and physical ability.  <br> <br>
+    
+    					    NOTE: Stretching is highly recommended before and after any operation session. <br> <br>
+        
+    					3. Operator shall board the REG-D track body and ensure there are no unsecured objects on the path. <br> <br>
+    
+    					4. Once ready, Operator may begin running at own pace. Do not sprint. Maintain an even pace and proper running form for optimal energy generation. <br> <br>
+    
+    					5. Continue to run on the REG-D track body until sufficient energy is stored in systems or Operator is no longer able or willing to continue. <br> <br>
+    
+					    6. To end a session, carefully lower forward running speed until the track body comes to a complete stop, then disembark the REG-D. <br> <br>
+
+
+					 REFER TO TO 1-33-34-6 FOR MAINTENANCE AND INSPECTION PROCEDURES
+ 				</body>
+			</html>
+			"}