Replaces all of our floor turfs and adds a few new assets! (#2452)

* AAAGHHH

A

* Replaces all of the floors! woah.... new posters and decals for ncr

* drought and floor fix

* sunlight

_maps/map_files/sunlightDebug/sunlightDebug.dmm

@@ -42,7 +42,6 @@
 /area/hallway/primary/central)
 "F" = (
 /obj/machinery/light/cold/directional/north,
-/turf/open/floor/ms13/concrete/industrial/alt,
 /area/hallway/primary/central)
 "H" = (
 /turf/closed/wall/ms13/bunker,
@@ -75,7 +74,6 @@
 /turf/open/floor/iron/stairs,
 /area/hallway/primary/central)
 "Z" = (
-/turf/open/floor/ms13/concrete/industrial/alt,
 /area/hallway/primary/central)
 
 (1,1,1) = {"

mojave/effects/ms13_decals.dm

@@ -217,6 +217,18 @@
 /obj/effect/turf_decal/ms13/graffiti/scorpion_south
 	icon_state = "scorpion_south"
 
+/obj/effect/turf_decal/ms13/graffiti/ncr_stop
+	icon_state = "ncr_stop"
+
+/obj/effect/turf_decal/ms13/graffiti/ncr_caution
+	icon_state = "ncr_caution"
+
+/obj/effect/turf_decal/ms13/graffiti/ncr_bear
+	icon_state = "ncr_bear"
+
+/obj/effect/turf_decal/ms13/graffiti/ncr
+	icon_state = "ncr"
+
 /obj/effect/turf_decal/ms13/graffiti/large
 	icon = 'mojave/icons/decals/graffiti64x64.dmi'
 

mojave/structures/wall_decorations.dm

@@ -190,6 +190,18 @@
 	desc = "DANGER. The text is apparent. But surely it's not relevant to you right now."
 	icon_state = "danger_sign"
 
+
+/obj/structure/ms13/wall_decor/exit
+	name = "exit sign"
+	desc = "An exit sign in red, pointing you to the exit of the building incase of an emergency."
+	icon_state = "exit"
+
+/obj/structure/ms13/wall_decor/wallscreen
+	name = "wallscreens"
+	desc = "Three monitors stuck to the wall, in-case you needed more monitors."
+	icon_state = "wallscreen"
+
+/// POSTERS ///
 /obj/structure/ms13/wall_decor/poster
 	name = "\improper NCR poster"
 	desc = "A fantastic piece of propaganda straight from the Republic. Don't you feel stronger just looking at it?"
@@ -208,17 +220,34 @@
 		playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, TRUE)
 		qdel(src)
 
+// NCR propaganad department mastercrafts //
+
+/obj/structure/ms13/wall_decor/poster/enlist
+	icon_state = "NCR_enlist"
+
+/obj/structure/ms13/wall_decor/poster/wrench
+	icon_state = "NCR_wrench"
+
+/obj/structure/ms13/wall_decor/poster/looselip
+	icon_state = "NCR_looselip"
+
+/obj/structure/ms13/wall_decor/poster/you
+	icon_state = "NCR_you"
+
+/obj/structure/ms13/wall_decor/poster/espionage
+	icon_state = "NCR_espionage"
+
+/obj/structure/ms13/wall_decor/poster/bombs
+	icon_state = "NCR_bombs"
+
+// Misc posters //
+
+/obj/structure/ms13/wall_decor/poster/fallout
+	icon_state = "poster_fallout"
+
+/obj/structure/ms13/wall_decor/poster/wecan
+	icon_state = "poster_wecan"
 /obj/structure/ms13/wall_decor/poster/wanted
 	name = "wanted poster"
 	desc = "A posted detailing that someone's end should be coming soon. Financial compensation to those reponsible."
 	icon_state = "wanted_poster"
-
-/obj/structure/ms13/wall_decor/exit
-	name = "exit sign"
-	desc = "An exit sign in red, pointing you to the exit of the building incase of an emergency."
-	icon_state = "exit"
-
-/obj/structure/ms13/wall_decor/wallscreen
-	name = "wallscreens"
-	desc = "Three monitors stuck to the wall, in-case you needed more monitors."
-	icon_state = "wallscreen"

mojave/turfs/ms13_floors.dm

@@ -19,7 +19,7 @@
 	. = ..()
 	if(has_alternate_states)
 		if(prob(25))
-			icon_state = "[icon_state]_[rand(1,(alternate_states))]"
+			icon_state = "[icon_state][rand(1,(alternate_states))]"
 		else if(has_base_states && prob(80))
 			icon_state = "[icon_state][rand(1,(base_states))]"
 
@@ -42,20 +42,19 @@
 
 /turf/open/floor/wood/ms13/common
 	icon_state = "wood_common"
-	alternate_states = 6
+	alternate_states = 7
 
 /turf/open/floor/wood/ms13/fancy
 	icon_state = "wood_fancy"
-	alternate_states = 6
-	has_base_states = FALSE
+	alternate_states = 7
 
 /turf/open/floor/wood/ms13/wide
 	icon_state = "wood_wide"
-	alternate_states = 6
+	alternate_states = 7
 
 /turf/open/floor/wood/ms13/mosaic
 	icon_state = "wood_mosaic"
-	alternate_states = 6
+	alternate_states = 7
 
 ////Broken Wood/Foundation floors////
 
@@ -174,56 +173,41 @@
 /turf/open/floor/wood/ms13/carpet
 	name = "carpet"
 	desc = "carpeted wooden flooring."
-	icon = 'mojave/icons/turf/carpet_red.dmi'
-	icon_state = "carpet-255"
-	base_icon_state = "carpet"
+	icon_state = "carpet_fancy_red"
 	footstep = FOOTSTEP_CARPET
 	barefootstep = FOOTSTEP_CARPET_BAREFOOT
 	clawfootstep = FOOTSTEP_CARPET_BAREFOOT
 	has_alternate_states = FALSE
-	smoothing_flags = SMOOTH_BITMASK
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_MS13_CARPET_RED, SMOOTH_GROUP_MS13_TILE)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_RED)
 	flags_1 = NONE
 	bullet_bounce_sound = null
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
 	tiled_dirt = FALSE
 	has_base_states = FALSE
 
 /turf/open/floor/wood/ms13/carpet/blue
-	icon = 'mojave/icons/turf/carpet_blue.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_MS13_CARPET_BLUE)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_BLUE)
+	icon_state = "carpet_fancy_blue"
 
 /turf/open/floor/wood/ms13/carpet/green
-	icon = 'mojave/icons/turf/carpet_green.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_GREEN)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_GREEN)
+	icon_state = "carpet_fancy_green"
 
 /turf/open/floor/wood/ms13/carpet/violet
-	icon = 'mojave/icons/turf/carpet_violet.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_VIOLET)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_VIOLET)
+	icon_state = "carpet_fancy_violet"
 
 /turf/open/floor/wood/ms13/carpet/shaggy
-	icon = 'mojave/icons/turf/carpet_shaggy_red.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_SHAGGY_RED)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_SHAGGY_RED)
+	icon_state = "carpet_red"
+
 
 /turf/open/floor/wood/ms13/carpet/shaggy/blue
-	icon = 'mojave/icons/turf/carpet_shaggy_blue.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_SHAGGY_BLUE)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_SHAGGY_BLUE)
+	icon_state = "carpet_blue"
+
 
 /turf/open/floor/wood/ms13/carpet/shaggy/green
-	icon = 'mojave/icons/turf/carpet_shaggy_green.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_SHAGGY_GREEN)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_SHAGGY_GREEN)
+	icon_state = "carpet_green"
+
 
 /turf/open/floor/wood/ms13/carpet/shaggy/violet
-	icon = 'mojave/icons/turf/carpet_shaggy_violet.dmi'
-	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN,SMOOTH_GROUP_MS13_CARPET_SHAGGY_VIOLET)
-	canSmoothWith = list(SMOOTH_GROUP_MS13_CARPET_SHAGGY_VIOLET)
+	icon_state = "carpet_violet"
+
 
 ////Tiled Floors////
 
@@ -270,23 +254,17 @@
 	icon_state = "grey_long"
 	alternate_states = 6
 
-/turf/open/floor/ms13/tile/blue
-	icon_state = "blue"
-
-/turf/open/floor/ms13/tile/blue/long
+/turf/open/floor/ms13/tile/long/blue
 	icon_state = "blue_long"
-	alternate_states = 6
+	alternate_states = 3
 
 /turf/open/floor/ms13/tile/navy
 	icon_state = "navy"
-	alternate_states = 7
+	alternate_states = 3
 
 /turf/open/floor/ms13/tile/brown
 	icon_state = "brown"
-
-/turf/open/floor/ms13/tile/brown/big
-	icon_state = "brown_big"
-	has_alternate_states = FALSE
+	alternate_states = 3
 
 /turf/open/floor/ms13/tile/fancy
 	icon_state = "fancy"
@@ -297,23 +275,19 @@
 
 /turf/open/floor/ms13/tile/large/navy
 	icon_state = "navy_large"
-	alternate_states = 3
-
-/turf/open/floor/ms13/tile/large/cream
-	icon_state = "cream_large"
-	has_alternate_states = FALSE
+	alternate_states = 2
 
 /turf/open/floor/ms13/tile/large/black
 	icon_state = "black_large"
-	alternate_states = 3
+	alternate_states = 2
 
 /turf/open/floor/ms13/tile/large/white
 	icon_state = "white_large"
-	alternate_states = 3
+	alternate_states = 2
 
 /turf/open/floor/ms13/tile/large/green
 	icon_state = "green_large"
-	alternate_states = 3
+	alternate_states = 2
 
 /turf/open/floor/ms13/tile/large/checkered
 	icon_state = "checker_large"
@@ -333,52 +307,35 @@
 /turf/open/floor/ms13/tile/full/green
 	icon_state = "green_full"
 
+/turf/open/floor/ms13/tile/full/black
+	icon_state = "black_full"
+
+/turf/open/floor/ms13/tile/full/white
+	icon_state = "white_full"
+
 ////Metal Floors////
 
 /turf/open/floor/ms13/metal
 	footstep = FOOTSTEP_PLATING //clonk
 	barefootstep = FOOTSTEP_HARD_BAREFOOT
 	clawfootstep = FOOTSTEP_HARD_CLAW
 	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	icon_state = "steel_industrial"
+	icon_state = "steel_tiles"
 	desc = "Metal flooring."
 	smoothing_groups = list(SMOOTH_GROUP_MS13_TILE)
 
 /turf/open/floor/ms13/metal/plate
 	icon_state = "steel_solid"
-	has_alternate_states = TRUE
-	alternate_states = 3
-
-/turf/open/floor/ms13/metal/border
-	icon_state = "steel_industrial_b"
-
-/turf/open/floor/ms13/metal/border/corner
-	icon_state = "steel_industrial_b_corner"
-
-/turf/open/floor/ms13/metal/border/sides
-	icon_state = "steel_industrial_b_sides"
-
-/turf/open/floor/ms13/metal/border/end
-	icon_state = "steel_industrial_b_end"
 
 /turf/open/floor/ms13/metal/grate
 	icon_state = "steel_grate"
 
-/turf/open/floor/ms13/metal/grate/alt
-	icon_state = "steel_grate_alt"
-
 /turf/open/floor/ms13/metal/grate/border
 	icon_state = "steel_grate_border"
 
 /turf/open/floor/ms13/metal/grate/border/warning
 	icon_state = "steel_grate_warning"
 
-/turf/open/floor/ms13/metal/warning
-	icon_state = "steel_warning"
-
-/turf/open/floor/ms13/metal/stayclear
-	icon_state = "steel_stayclear"
-
 /turf/open/floor/ms13/metal/walkway
 	icon_state = "steel_walkway"
 
@@ -394,6 +351,8 @@
 	icon_state = "concrete_big"
 	desc = "Concrete slabs."
 	smoothing_groups = list(SMOOTH_GROUP_MS13_TILE)
+	has_alternate_states = TRUE
+	alternate_states = 1
 
 /turf/open/floor/ms13/concrete/small
 	icon_state = "concrete_small"
@@ -409,21 +368,12 @@
 	icon_state = "concrete_industrial"
 	desc = "Heavy duty concrete slabs." //DAS CONCRETE BABY
 
-/turf/open/floor/ms13/concrete/industrial/alt
-	icon_state = "concrete_industrial_alt"
-
-/turf/open/floor/ms13/concrete/industrial/split
-	icon_state = "concrete_industrial_split"
-
 /turf/open/floor/ms13/concrete/industrial/walkway
 	icon_state = "concrete_walkway"
 
 /turf/open/floor/ms13/concrete/industrial/walkway/corner
 	icon_state = "concrete_walkway_corner"
 
-/turf/open/floor/ms13/concrete/industrial/walkway/end
-	icon_state = "concrete_walkway_end"
-
 ////Hybrid Floors////
 
 /turf/open/floor/ms13/concrete/cable