Merge pull request #12627 from Very-Soft/gbtweaks

More maptweaks!

code/modules/planet/virgo3c_vr.dm

@@ -26,7 +26,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 	seconds_in_day = 6 HOURS
 
 /datum/planet/virgo3c
-	name = "Virgo-3c"
+	name = "Virgo-3C"
 	desc = "A habitable moon of the gas giant Virgo 3. The volcanic activity of this moon keeps its atmosphere warm enough for life to flourish."
 	current_time = new /datum/time/virgo3c()
 	planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3c
@@ -53,7 +53,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 	var/min = 0
 
 	switch(sun_position)
-		if(0 to 0.45) // Night
+		if(0 to 0.475) // Night
 			low_brightness = 0.3
 			low_color = "#000066"
 
@@ -61,7 +61,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#66004D"
 			min = 0
 
-		if(0.45 to 0.50) // Twilight
+		if(0.475 to 0.50) // Twilight
 			low_brightness = 0.5
 			low_color = "#66004D"
 
@@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#CC3300"
 			min = 0.40
 
-		if(0.50 to 0.55) // Sunrise/set
+		if(0.50 to 0.525) // Sunrise/set
 			low_brightness = 0.9
 			low_color = "#CC3300"
 
@@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
 			high_color = "#FF9933"
 			min = 0.50
 
-		if(0.55 to 1.00) // Noon
+		if(0.525 to 1.00) // Noon
 			low_brightness = 3.0
 			low_color = "#DDDDDD"
 

code/modules/power/port_gen_vr.dm

@@ -289,8 +289,8 @@
 	icon_state = "reg"
 	circuit = /obj/item/weapon/circuitboard/machine/reg
 	irradiate = FALSE
-	power_gen = 0	//It's big but it gets adjusted based on what you put into it!!!
-	var/default_power_gen = 1000000
+	power_gen = 0	
+	var/default_power_gen = 1000000	//It's big but it gets adjusted based on what you put into it!!!
 	var/part_mult = 0
 	pixel_x = -32
 	plane = ABOVE_MOB_PLANE
@@ -300,8 +300,8 @@
 	density = FALSE
 
 /obj/machinery/power/rtg/d_type_reg/Initialize()
-	. = ..()
 	pixel_x = -32
+	. = ..()
 	
 /obj/machinery/power/rtg/d_type_reg/Destroy()
 	. = ..()
@@ -322,6 +322,7 @@
 	part_mult = n	
 
 /obj/machinery/power/rtg/d_type_reg/attackby(obj/item/I, mob/user, params)
+	pixel_x = -32
 	if(default_deconstruction_screwdriver(user, I))
 		return
 	else if(default_deconstruction_crowbar(user, I))
@@ -329,6 +330,7 @@
 	return ..()
 
 /obj/machinery/power/rtg/d_type_reg/update_icon()
+	pixel_x = -32
 	if(panel_open)
 		icon_state = "reg-o"
 	else if(buckled_mobs && buckled_mobs.len > 0)

maps/groundbase/gb-misc.dmm

@@ -2485,7 +2485,7 @@
 /area/holodeck/source_gym)
 "jZ" = (
 /turf/unsimulated/map/edge,
-/area/space)
+/area/overmap)
 "kw" = (
 /obj/effect/floor_decal/sign/small_5,
 /turf/simulated/floor/holofloor/wood,
@@ -2527,7 +2527,7 @@
 "mV" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
-	base_turf = /turf/unsimulated/floor;
+	base_turf = /turf/simulated/floor/reinforced/virgo3c;
 	landmark_tag = "supply_cc";
 	name = "Centcom Supply Depot"
 	},
@@ -2871,7 +2871,7 @@
 /area/holodeck/source_patient_ward)
 "EA" = (
 /turf/unsimulated/map,
-/area/space)
+/area/overmap)
 "ED" = (
 /obj/structure/fitness/weightlifter,
 /obj/effect/floor_decal/industrial/outline/yellow,

maps/groundbase/gb-z1.dmm

@@ -3978,6 +3978,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level1/centsquare)
+"kR" = (
+/obj/machinery/newscaster{
+	layer = 3.3;
+	pixel_y = -32
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "kT" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 8;
@@ -4139,7 +4146,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/equipment)
 "ll" = (
-/obj/structure/closet/secure_closet/personal,
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
 /obj/effect/floor_decal/industrial/outline,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4732,6 +4741,10 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/newscaster{
+	layer = 3.3;
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "mY" = (
@@ -7938,7 +7951,9 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level1/southwestspur)
 "vP" = (
-/obj/structure/closet/secure_closet/personal,
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
 /obj/effect/floor_decal/industrial/outline,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -8828,7 +8843,9 @@
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level1/centsquare)
 "ye" = (
-/obj/structure/closet/secure_closet/personal,
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
 /obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
@@ -14749,6 +14766,10 @@
 	dir = 8;
 	pixel_x = 32
 	},
+/obj/machinery/newscaster{
+	layer = 3.3;
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
 "Ol" = (
@@ -16133,7 +16154,9 @@
 /turf/simulated/floor/bluegrid,
 /area/groundbase/command/ai/robot)
 "Sz" = (
-/obj/structure/closet/secure_closet/miner,
+/obj/structure/closet/secure_closet/miner{
+	anchored = 1
+	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -16686,7 +16709,9 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
 "TY" = (
-/obj/structure/closet/secure_closet/miner,
+/obj/structure/closet/secure_closet/miner{
+	anchored = 1
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/mining)
 "TZ" = (
@@ -23895,7 +23920,7 @@ Xg
 ht
 ht
 Uc
-ht
+kR
 pj
 MO
 MO

maps/groundbase/groundbase_areas.dm

@@ -57,19 +57,41 @@
 /area/groundbase/level2/sw
 	name = "Southwest Rascal's Pass Level 2"
 
+/area/groundbase/level2/northspur
+	name = "\improper North Spur"
+	base_turf = /turf/simulated/open/virgo3c
+/area/groundbase/level2/eastspur
+	name = "\improper East Spur"
+	base_turf = /turf/simulated/open/virgo3c
+/area/groundbase/level2/westspur
+	name = "\improper West Spur"
+	base_turf = /turf/simulated/open/virgo3c
+/area/groundbase/level2/southeastspur
+	name = "\improper Southeast Spur"
+	base_turf = /turf/simulated/open/virgo3c
+/area/groundbase/level2/southwestspur
+	name = "\improper Southwest Spur"
+	base_turf = /turf/simulated/open/virgo3c
+
 /area/groundbase/level3
 	name = "Rascal's Pass Level 3"
 	flags = AREA_FLAG_IS_NOT_PERSISTENT
-
 /area/groundbase/level3/ne
 	name = "Northeast Rascal's Pass Level 3"
+/area/groundbase/level3/ne/open
+	base_turf = /turf/simulated/open/virgo3c
 /area/groundbase/level3/nw
 	name = "Northwest Rascal's Pass Level 3"
+/area/groundbase/level3/nw/open
+	base_turf = /turf/simulated/open/virgo3c
 /area/groundbase/level3/se
 	name = "Southeast Rascal's Pass Level 3"
+/area/groundbase/level3/se/open
+	base_turf = /turf/simulated/open/virgo3c
 /area/groundbase/level3/sw
 	name = "Southwest Rascal's Pass Level 3"
-
+/area/groundbase/level3/sw/open
+	base_turf = /turf/simulated/open/virgo3c
 
 /area/groundbase/science
 	name = "Science"
@@ -381,4 +403,13 @@
 	excluded |= /area/groundbase/level3/nw
 	excluded |= /area/groundbase/level3/se
 	excluded |= /area/groundbase/level3/sw
+	excluded |= /area/groundbase/level2/northspur
+	excluded |= /area/groundbase/level2/eastspur
+	excluded |= /area/groundbase/level2/westspur
+	excluded |= /area/groundbase/level2/southeastspur
+	excluded |= /area/groundbase/level2/southwestspur
+	excluded |= /area/groundbase/level3/ne/open
+	excluded |= /area/groundbase/level3/nw/open
+	excluded |= /area/groundbase/level3/se/open
+	excluded |= /area/groundbase/level3/sw/open
 	..()