Merge pull request #15295 from SatinIsle/RainCity

Rain City

code/game/turfs/flooring/flooring_decals_vr.dm

@@ -463,4 +463,9 @@
 /obj/effect/floor_decal/industrial/warning/color/cee/red
 	color = "#a70000"
 /obj/effect/floor_decal/industrial/warning/color/tile/red
-	color = "#a70000"
+	color = "#a70000"
+
+//Road markings
+
+/obj/effect/floor_decal/road/center
+	icon_state = "center_lines"

code/game/turfs/simulated/outdoors/outdoors.dm

@@ -179,3 +179,10 @@ var/list/turf_edge_cache = list()
 			if(prob(66))
 				return
 	demote()
+
+/turf/simulated/floor/outdoors/road
+	name = "road"
+	icon = 'icons/turf/concrete.dmi'
+	icon_state = "concrete_dark"
+	desc = "Some sort of material composite road."
+	edge_blending_priority = -1

code/game/turfs/simulated/outdoors/outdoors_vr.dm

@@ -140,7 +140,17 @@
 	icon_base = "slab"
 	build_type = /obj/item/stack/tile/floor/sidewalk/slab
 
-/obj/item/stack/tile/floor/sidewalk/slab
+/obj/item/stack/tile/floor/sidewalk/slab/
+
+/turf/simulated/floor/outdoors/sidewalk/slab/city
+	icon_state = "cityslab"
+	initial_flooring = /decl/flooring/outdoors/sidewalk/slab/city
+
+/decl/flooring/outdoors/sidewalk/slab/city
+	icon_base = "cityslab"
+	build_type = /obj/item/stack/tile/floor/sidewalk/slab/city
+
+/obj/item/stack/tile/floor/sidewalk/slab/city
 
 /obj/item/stack/tile/floor/concrete //Proper concrete tile.
 	name = "concrete tile"

code/modules/awaymissions/redgate.dm

@@ -204,4 +204,338 @@
 
 /area/redgate/hotsprings/house/succcave
 	name = "tiny cave"
-	icon_state = "hotsprings_succcave"
+	icon_state = "hotsprings_succcave"
+
+// City areas, there are soooo many
+
+/area/redgate/city
+	name = "rain city"
+	icon_state = "red"
+	requires_power = 0
+
+/area/redgate/city/streets
+	name = "streets"
+	icon_state = "red"
+	forced_ambience = list('sound/effects/weather/acidrain_mid.ogg')
+
+/area/redgate/city/science
+	name = "science facility"
+	icon_state = "purple"
+
+/area/redgate/city/hospital
+	name = "hospital"
+	icon_state = "green"
+
+/area/redgate/city/casino
+	name = "casino"
+	icon_state = "yellow"
+
+/area/redgate/city/comms
+	name = "radio tower"
+	icon_state = "yellow"
+
+/area/redgate/city/check1
+	name = "checkpoint"
+	icon_state = "purple"
+
+/area/redgate/city/check2
+	name = "checkpoint"
+	icon_state = "purple"
+
+/area/redgate/city/apartments
+	name = "apartments"
+	icon_state = "bluenew"
+
+/area/redgate/city/warehouse
+	name = "warehouse"
+	icon_state = "green"
+
+/area/redgate/city/corporation
+	name = "corporation"
+	icon_state = "yellow"
+
+/area/redgate/city/pool
+	name = "pool"
+	icon_state = "bluenew"
+
+/area/redgate/city/morgue
+	name = "funeral home"
+	icon_state = "green"
+
+/area/redgate/city/dealership
+	name = "car dealership"
+	icon_state = "yellow"
+
+/area/redgate/city/hotel
+	name = "hotel"
+	icon_state = "purple"
+
+/area/redgate/city/police
+	name = "police station"
+	icon_state = "green"
+
+/area/redgate/city/church
+	name = "church"
+	icon_state = "yellow"
+
+/area/redgate/city/bar1
+	name = "dance bar"
+	icon_state = "green"
+
+/area/redgate/city/bar2
+	name = "abandoned bar"
+	icon_state = "green"
+
+/area/redgate/city/lasertag
+	name = "laser tag"
+	icon_state = "purple"
+
+/area/redgate/city/gym
+	name = "gym"
+	icon_state = "green"
+
+/area/redgate/city/scughouse
+	name = "abandoned house"
+	icon_state = "bluenew"
+
+/area/redgate/city/parkinglot
+	name = "parking lot"
+	icon_state = "green"
+
+/area/redgate/city/supermarket
+	name = "supermarket"
+	icon_state = "green"
+
+/area/redgate/city/nifshop
+	name = "NIF store"
+	icon_state = "bluenew"
+
+/area/redgate/city/clotheshop
+	name = "unclothe"
+	icon_state = "yellow"
+
+/area/redgate/city/toys
+	name = "toystore"
+	icon_state = "green"
+
+/area/redgate/city/offlicense
+	name = "off-license"
+	icon_state = "green"
+
+/area/redgate/city/cafe
+	name = "cafe"
+	icon_state = "purple"
+
+/area/redgate/city/restaurant
+	name = "restaurant"
+	icon_state = "green"
+
+/area/redgate/city/laundry
+	name = "laundromat"
+	icon_state = "green"
+
+/area/redgate/city/wiz
+	name = "wizard store"
+	icon_state = "bluenew"
+
+/area/redgate/city/altevian
+	name = "altevian imports"
+	icon_state = "yellow"
+
+/area/redgate/city/pizza
+	name = "pizza place"
+	icon_state = "green"
+
+/area/redgate/city/pharmacy
+	name = "pharmacy"
+	icon_state = "green"
+
+/area/redgate/city/costumes
+	name = "costume store"
+	icon_state = "purple"
+
+/area/redgate/city/stripclub
+	name = "strip club"
+	icon_state = "party"
+
+/area/redgate/city/cards
+	name = "card game stadium"
+	icon_state = "purple"
+
+/area/redgate/city/waterworks
+	name = "water treatment plant"
+	icon_state = "green"
+
+/area/redgate/city/workshop
+	name = "ship hanger"
+	icon_state = "purple"
+
+/area/redgate/city/ripper
+	name = "prosthetic lab"
+	icon_state = "purple"
+
+/area/redgate/city/engine
+	name = "singularity power station"
+	icon_state = "green"
+
+/area/redgate/city/spa
+	name = "spa"
+	icon_state = "purple"
+
+/area/redgate/city/library
+	name = "library"
+	icon_state = "bluenew"
+
+/area/redgate/city/teppi
+	name = "farm"
+	icon_state = "purple"
+
+/area/redgate/city/gallery
+	name = "art gallery"
+	icon_state = "green"
+
+/area/redgate/city/theatre
+	name = "theatre"
+	icon_state = "purple"
+
+/area/redgate/city/doctor
+	name = "back alley doctor"
+	icon_state = "bluenew"
+
+/area/redgate/city/sims
+	name = "weird pool"
+	icon_state = "bluenew"
+
+/area/redgate/city/weretiger
+	name = "back alley home"
+	icon_state = "purple"
+
+/area/redgate/city/dump
+	name = "trash pile"
+	icon_state = "purple"
+
+/area/redgate/city/succ
+	name = "alien home"
+	icon_state = "green"
+
+/area/redgate/city/chopshop
+	name = "back alley workshop"
+	icon_state = "yellow"
+
+/area/redgate/city/crates
+	name = "empty building"
+	icon_state = "purple"
+
+/area/redgate/city/drugden
+	name = "back alley home"
+	icon_state = "purple"
+
+/area/redgate/city/gamblingden
+	name = "gambling den"
+	icon_state = "yellow"
+
+/area/redgate/city/tarot
+	name = "tarot card reading"
+	icon_state = "green"
+
+/area/redgate/city/fightclub
+	name = "empty back-alley house"
+	icon_state = "purple"
+
+/area/redgate/city/rats
+	name = "rat infested house"
+	icon_state = "bluenew"
+
+/area/redgate/city/shooting
+	name = "shooting gallery"
+	icon_state = "green"
+
+/area/redgate/city/storage
+	name = "storage units"
+	icon_state = "bluenew"
+
+/area/redgate/city/cardmon
+	name = "back-alley home"
+	icon_state = "green"
+
+/area/redgate/city/conveyors
+	name = "conveyor building"
+	icon_state = "bluenew"
+
+/area/redgate/city/dodgypharmacy
+	name = "back-alley pharmacy"
+	icon_state = "purple"
+
+/area/redgate/city/house1
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house2
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house3
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house4
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house5
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house6
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house7
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house8
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house9
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house10
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house11
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house12
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house13
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house14
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house15
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house16
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house17
+	name = "house"
+	icon_state = "green"
+
+/area/redgate/city/house18
+	name = "house"
+	icon_state = "green"
+
+

code/modules/power/lighting_neon.dm

@@ -0,0 +1,183 @@
+//Coloured lights
+
+/obj/item/weapon/light/bulb/neon/red
+	brightness_range = 4
+	color = "#da0205"
+	brightness_color = "#da0205"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/blue
+	brightness_range = 4
+	color = "#0048ff"
+	brightness_color = "#0048ff"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/green
+	brightness_range = 4
+	color = "#00ff15"
+	brightness_color = "#00ff15"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/pink
+	brightness_range = 4
+	color = "#ff00ee"
+	brightness_color = "#ff00ee"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/yellow
+	brightness_range = 4
+	color = "#fff200"
+	brightness_color = "#fff200"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/purple
+	brightness_range = 4
+	color = "#6200ff"
+	brightness_color = "#6200ff"
+	init_brightness_range = 4
+
+/obj/item/weapon/light/bulb/neon/orange
+	brightness_range = 4
+	color = "#ff8000"
+	brightness_color = "#ff8000"
+	init_brightness_range = 4
+
+/obj/machinery/light/small/neon
+	icon = 'icons/obj/lighting_neon.dmi'
+	name = "Neon Sign"
+	icon_state = "GenericGreen1"
+	base_state = "GenericGreen"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/green
+	shows_alerts = FALSE
+	anchored = TRUE
+	plane = ABOVE_MOB_PLANE
+	layer = ABOVE_MOB_LAYER
+	construct_type = null
+	overlay_color = LIGHT_COLOR_INCANDESCENT_BULB
+	overlay_above_everything = TRUE
+
+//Generic Signs
+
+/obj/machinery/light/small/neon/generic_green
+	icon_state = "GenericGreen1"
+	base_state = "GenericGreen"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/green
+
+/obj/machinery/light/small/neon/generic_yellow
+	icon_state = "GenericYellow1"
+	base_state = "GenericYellow"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/yellow
+
+/obj/machinery/light/small/neon/generic_red
+	icon_state = "GenericRed1"
+	base_state = "GenericRed"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/red
+
+/obj/machinery/light/small/neon/generic_blue
+	icon_state = "GenericBlue1"
+	base_state = "GenericBlue"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/blue
+
+/obj/machinery/light/small/neon/generic_orange
+	icon_state = "GenericOrange1"
+	base_state = "GenericOrange"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/orange
+
+/obj/machinery/light/small/neon/generic_pink
+	icon_state = "GenericPink1"
+	base_state = "GenericPink"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/pink
+
+/obj/machinery/light/small/neon/generic_purple
+	icon_state = "GenericPurple1"
+	base_state = "GenericPurple"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/purple
+
+
+// Specific locations
+
+/obj/machinery/light/small/neon/booze1
+	icon_state = "Booze1"
+	base_state = "Booze"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/green
+
+/obj/machinery/light/small/neon/booze2
+	icon_state = "BoozeWord1"
+	base_state = "BoozeWord"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/green
+
+/obj/machinery/light/small/neon/looktoucheat
+	icon_state = "LookTouchEat1"
+	base_state = "LookTouchEat"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/pink
+
+/obj/machinery/light/small/neon/pharmacy
+	icon_state = "Pharmacy1"
+	base_state = "Pharmacy"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/green
+
+/obj/machinery/light/small/neon/altevian
+	icon_state = "Altevian1"
+	base_state = "Altevian"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/orange
+
+/obj/machinery/light/small/neon/nif1
+	icon_state = "NIF1"
+	base_state = "NIF"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/blue
+
+/obj/machinery/light/small/neon/nif2
+	icon_state = "NIFpic1"
+	base_state = "NIFpic"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/blue
+
+/obj/machinery/light/small/neon/redcross
+	icon_state = "RedCross1"
+	base_state = "RedCross"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/red
+
+/obj/machinery/light/small/neon/bar
+	icon_state = "Bar1"
+	base_state = "Bar"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/purple
+
+/obj/machinery/light/small/neon/unclothe
+	icon_state = "Unclothe1"
+	base_state = "Unclothe"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/orange
+
+/obj/machinery/light/small/neon/import
+	icon_state = "Import1"
+	base_state = "Import"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/yellow
+
+/obj/machinery/light/small/neon/police
+	icon_state = "Police1"
+	base_state = "Police"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/pink
+
+/obj/machinery/light/small/neon/dice
+	icon_state = "Dice1"
+	base_state = "Dice"
+	desc = "A bright neon wall sign."
+	light_type = /obj/item/weapon/light/bulb/neon/yellow

code/modules/power/lighting_vr.dm

@@ -188,6 +188,19 @@
 		qdel(overlay_layer)
 		overlay_layer = null
 
+/obj/machinery/light/lamppost
+	icon = 'icons/obj/lighting32x64.dmi'
+	icon_state = "lamppost1"
+	base_state = "lamppost"
+	desc = "A tall lampost that extends over an area"
+	light_type = /obj/item/weapon/light/bulb
+	shows_alerts = FALSE
+	anchored = TRUE
+	plane = ABOVE_MOB_PLANE
+	layer = ABOVE_MOB_LAYER
+	construct_type = null
+	overlay_color = LIGHT_COLOR_INCANDESCENT_BULB
+	overlay_above_everything = TRUE
 
 /*
 /obj/machinery/light_construct/bigfloorlamp

maps/groundbase/groundbase_defines.dm

@@ -217,7 +217,8 @@
 		list("Redgate - Dark Adventure"),
 		list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"),
 		list("Redgate - Star Dog"),
-		list("Redgate - Hotsprings")
+		list("Redgate - Hotsprings"),
+		list("Redgate - Rain City")
 		)
 
 	lateload_gb_north = list(

maps/offmap_vr/common_offmaps.dm

@@ -283,6 +283,11 @@
 	desc = "This place is rather cosy for somewhere so abandoned!"
 	mappath = 'maps/redgate/hotsprings.dmm'
 
+/datum/map_template/common_lateload/redgate/cybercity
+	name = "Redgate - Rain City"
+	desc = "A strange city on lockdown."
+	mappath = 'maps/redgate/cybercity.dmm'
+
 
 //////////////////////////////////////////////////////////////////////////////////////
 // Admin-use z-levels for loading whenever an admin feels like

maps/stellar_delight/stellar_delight_defines.dm

@@ -174,7 +174,8 @@
 		list("Redgate - Dark Adventure"),
 		list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"),
 		list("Redgate - Star Dog"),
-		list("Redgate - Hotsprings")
+		list("Redgate - Hotsprings"),
+		list("Redgate - Rain City")
 		)
 
 	ai_shell_restricted = TRUE

maps/tether/tether_defines.dm

@@ -204,7 +204,8 @@
 		list("Redgate - Dark Adventure"),
 		list("Redgate - Eggnog Town Underground","Redgate - Eggnog Town"),
 		list("Redgate - Star Dog"),
-		list("Redgate - Hotsprings")
+		list("Redgate - Hotsprings"),
+		list("Redgate - Rain City")
 		)
 
 	ai_shell_restricted = TRUE

vorestation.dme

@@ -3547,6 +3547,7 @@
 #include "code\modules\power\gravitygenerator_vr.dm"
 #include "code\modules\power\grid_checker.dm"
 #include "code\modules\power\lighting.dm"
+#include "code\modules\power\lighting_neon.dm"
 #include "code\modules\power\lighting_vr.dm"
 #include "code\modules\power\lightswitch_vr.dm"
 #include "code\modules\power\port_gen.dm"