Merge branch 'overmap4' into moreplanets

code/datums/atmosphere/planetary.dm

@@ -21,8 +21,8 @@
 	minimum_pressure = WARNING_LOW_PRESSURE + 10
 	maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1
 
-	minimum_temp = HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT + 1
-	maximum_temp = 350
+	minimum_temp = T20C + 80
+	maximum_temp = T20C + 120
 
 /datum/atmosphere/icemoon
 	id = ICEMOON_DEFAULT_ATMOS

code/datums/ruins/rockplanet.dm

@@ -74,12 +74,6 @@
 	description = "A chunk of a station that broke off.."
 	suffix = "rockplanet_boxsci.dmm"
 
-/datum/map_template/ruin/rockplanet/honorable
-	name = "Honorable deeds storage"
-	id = "honorable"
-	description = "This place must be very honorable and should be disturbed."
-	suffix = "rockplanet_unhonorable.dmm"
-
 /* greeble
 /datum/map_template/ruin/rockplanet/rd_god
 	id = "rd_god"

code/datums/ruins/wasteplanet.dm

@@ -54,3 +54,9 @@
 	id = "oldpod"
 	description = "An abandoned tradepost."
 	suffix = "wasteplanet_tradepost.dmm"
+
+/datum/map_template/ruin/wasteplanet/tarpit
+	name = "Tar pit"
+	id = "tarpit"
+	description = "A facility once constructed over a asphalt deposit."
+	suffix = "wasteplanet_tarpit.dmm"

code/datums/weather/weather_types/acid_rain.dm

@@ -5,6 +5,7 @@
 
 	telegraph_duration = 400
 	telegraph_message = "<span class='boldwarning'>Thunder rumbles far above. You hear droplets drumming against the canopy. Seek shelter.</span>"
+	telegraph_overlay = "acid_rain_low"
 
 	weather_message = "<span class='userdanger'><i>Acidic rain pours down around you! Get inside!</i></span>"
 	weather_overlay = "acid_rain"

code/game/objects/effects/decals/turfdecal/flooring_decals.dm

@@ -110,6 +110,12 @@
 	}													\
 	/obj/effect/turf_decal/spline/fancy/corner/##color_name {	\
 		icon_state = "spline_fancy_corner"				\
+	}													\
+	/obj/effect/turf_decal/road/line/##color_name {		\
+		color = ##tile_color							\
+	}													\
+	/obj/effect/turf_decal/road/line/edge/##color_name {		\
+		color = ##tile_color							\
 	}
 
 TURF_DECAL_COLOR_HELPER(neutral, null, 75)
@@ -693,3 +699,26 @@ TURF_DECAL_COLOR_HELPER(bottlegreen, "#57967f", 255)
 	alpha = 230
 	icon = 'whitesands/icons/obj/solgov_floor.dmi'
 	icon_state = "center"
+
+/obj/effect/turf_decal/road
+	name = "roal decal"
+	icon_state = "road"
+	alpha = 180
+
+/obj/effect/turf_decal/road/edge
+	icon_state = "road_edge"
+
+/obj/effect/turf_decal/road/stripes
+	icon_state = "road_stripes"
+
+/obj/effect/turf_decal/road/stop
+	icon_state = "road_stop"
+
+/obj/effect/turf_decal/road/slow
+	icon_state = "road_slow"
+
+/obj/effect/turf_decal/road/line
+	icon_state = "road_line"
+
+/obj/effect/turf_decal/road/line/edge
+	icon_state = "road_line_edge"

code/game/objects/items/decal_painter.dm

@@ -163,7 +163,8 @@
 	"siding_thinplating_corner","siding_wideplating_line","siding_wideplating_end","siding_wideplating_corner","siding_wood_line",
 	"siding_wood_corner","siding_wood_end","trimline","trimline_corner","trimline_end","trimline_box","trimline_arrow_cw","trimline_arrow_ccw","trimline_fill",
 	"trimline_corner_fill","trimline_end_fill","trimline_box_fill","trimline_arrow_cw_fill","trimline_arrow_ccw_fill",
-	"trimline_shrink_cw","trimline_shrink_ccw","trimline_warn", "trimline_warn_fill"
+	"trimline_shrink_cw","trimline_shrink_ccw","trimline_warn", "trimline_warn_fill",
+	"road","road_edge", "road_stripes", "road_stop", "road_slow", "road_line", "road_line_edge"
 	)
 
 	var/list/color_disallowed = list(

code/game/turfs/open/floor/conc_floor.dm

@@ -269,3 +269,12 @@
 /turf/open/floor/concrete/reinforced/acid_act(acidpwr, acid_volume)
 	acidpwr = min(acidpwr, 50)
 	return ..()
+
+/turf/open/floor/concrete/pavement
+	name = "pavement"
+	desc = "The hot, coarse, and somewhat pavement. Vehicles driven on this are generally quiter than on traditional concrete, and is prefered for roadways."
+	icon_state = "pavement"
+	broken_states = null
+	shape_types = list(
+		/turf/open/floor/concrete/pavement,
+	)

code/game/turfs/open/floor/plating/icemoon.dm

@@ -14,8 +14,6 @@
 	footstep = FOOTSTEP_SNOW
 	barefootstep = FOOTSTEP_SNOW
 	clawfootstep = FOOTSTEP_SNOW
-	broken_states = list("snow")
-	burnt_states = list("snow")
 	bullet_sizzle = TRUE
 	bullet_bounce_sound = null
 	digResult = /obj/item/stack/sheet/mineral/snow
@@ -85,6 +83,10 @@
 	ScrapeAway()
 	return TRUE
 
+/turf/open/floor/plating/asteroid/snow/ex_act(severity, target)
+	. = ..()
+	ScrapeAway()
+
 /turf/open/floor/plating/asteroid/snow/lit
 	light_range = 2
 	light_power = 1

code/game/turfs/open/floor/plating/lavaland.dm

@@ -82,8 +82,9 @@
 	planetary_atmos = TRUE
 	icon = 'icons/turf/floors/lava_grass_red.dmi'
 	smooth_icon = 'icons/turf/floors/lava_grass_red.dmi'
-	light_power = 1
 	light_range = 2
+	light_power = 0.6
+	light_color = LIGHT_COLOR_FIRE
 	gender = PLURAL
 
 /turf/open/floor/plating/grass/lava/orange

code/game/turfs/open/water.dm

@@ -4,7 +4,7 @@
 	desc = "Shallow water."
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "riverwater_motion"
-	baseturfs = /turf/open/chasm/lavaland
+	baseturfs = /turf/open/water
 	planetary_atmos = TRUE
 	slowdown = 1
 	bullet_sizzle = TRUE
@@ -15,6 +15,25 @@
 	clawfootstep = FOOTSTEP_WATER
 	heavyfootstep = FOOTSTEP_WATER
 
+	var/datum/reagent/reagent_to_extract = /datum/reagent/water
+	var/extracted_reagent_visible_name = "water"
+
+/turf/open/water/attackby(obj/item/tool, mob/user, params)
+	if(!reagent_to_extract)
+		return ..()
+	var/obj/item/reagent_containers/glass/container = tool
+	if(!container)
+		return ..()
+	if(container.reagents.total_volume >= container.volume)
+		to_chat(user, "<span class='danger'>[container] is full.</span>")
+		return
+	container.reagents.add_reagent(reagent_to_extract, rand(5, 10))
+	user.visible_message("<span class='notice'>[user] scoops [extracted_reagent_visible_name] from the [src] with \the [container].</span>", "<span class='notice'>You scoop out [extracted_reagent_visible_name] from the [src] using \the [container].</span>")
+	return TRUE
+
+/turf/open/water/can_have_cabling()
+	return FALSE
+
 /turf/open/water/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
 		if(RCD_FLOORWALL)
@@ -47,3 +66,11 @@
 	color = "#0099ff"
 	light_color = LIGHT_COLOR_DARK_BLUE
 
+/turf/open/water/tar
+	name = "tar pit"
+	desc = "Shallow tar. Will slow you down significantly. You could use a beaker to scoop some out..."
+	color = "#222424"
+	light_range = 0
+	slowdown = 2
+	reagent_to_extract = /datum/reagent/asphalt
+	extracted_reagent_visible_name = "tar"

code/modules/awaymissions/mission_code/snowdin.dm

@@ -161,6 +161,7 @@
 		return
 	C.reagents.add_reagent(/datum/reagent/toxin/plasma, rand(5, 10))
 	user.visible_message("<span class='notice'>[user] scoops some plasma from the [src] with \the [C].</span>", "<span class='notice'>You scoop out some plasma from the [src] using \the [C].</span>")
+	return TRUE
 
 /turf/open/lava/plasma/burn_stuff(AM)
 	. = 0

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -2644,6 +2644,13 @@
 	concrete_type = /datum/reagent/concrete/hexacrete
 	units_per_aggregate = 2
 
+/datum/reagent/cement/roadmix
+	name = "Road mixture"
+	description = "A mix of cement and asphalt. Looks less tasty than normal cement."
+	color = "#5c6361"
+	potency = 3
+	concrete_type = /datum/reagent/concrete/pavement
+
 /datum/reagent/concrete
 	name = "Concrete"
 	description = "A mix of cement and aggregate, commonly used as a bulk building material."
@@ -2696,6 +2703,12 @@
 	wall_type = /turf/closed/wall/concrete/reinforced
 	floor_type = /turf/open/floor/concrete/reinforced
 
+/datum/reagent/concrete/pavement
+	name = "Pavement"
+	description = "Road surface, blacktop, asphalt concrete, whatever you call it, it's the most common material used in constructing runways for ships and roadways for vehicles."
+	color = "#3f4543"
+	floor_type = /turf/open/floor/concrete/pavement
+
 /datum/reagent/calcium
 	name = "Calcium"
 	description = "A dull gray metal important to bones."
@@ -2716,6 +2729,19 @@
 	reagent_state = SOLID
 	color = "#c2c2c2"
 
+/datum/reagent/asphalt
+	name = "Asphalt"
+	description = "A dark, viscous liquid. Often found in oil deposits, although sometimes it can seep to the surface."
+	color = "#111212"
+	taste_description = "petroleum"
+
+/datum/reagent/asphalt/on_mob_life(mob/living/carbon/M)
+	. = ..()
+	if(prob(min(current_cycle/2, 5)))
+		M.adjustToxLoss(2*REM)
+	if(prob(min(current_cycle/4, 10)))
+		M.adjustOrganLoss(ORGAN_SLOT_STOMACH,3*REM)
+
 /datum/reagent/mutationtoxin/kobold
 	name = "Kobold Mutation Toxin"
 	description = "An ashen toxin. Something about this seems lesser."

code/modules/reagents/chemistry/recipes/others.dm

@@ -720,3 +720,14 @@
 	var/location = get_turf(holder.my_atom)
 	for(var/i = 1, i <= created_volume, i++)
 		new /obj/item/stack/sheet/mineral/titanium(location)
+
+/datum/chemical_reaction/asphalt_heat
+	results = list(/datum/reagent/carbon = 0.4, /datum/reagent/acetone = 0.2, /datum/reagent/consumable/ethanol = 0.2, /datum/reagent/consumable/ethanol = 0.2)
+	required_reagents = list(/datum/reagent/asphalt = 1)
+	required_temp = 418
+	mix_message = "The mixture separates."
+
+/datum/chemical_reaction/pavement
+	results = list(/datum/reagent/cement/roadmix = 2)
+	required_reagents = list(/datum/reagent/cement = 1, /datum/reagent/asphalt = 1)
+	mix_message = "The mixture mixing suddenly reminds you of cramped urban worlds."

code/modules/vehicles/pimpin_ride.dm

@@ -79,7 +79,8 @@
 /obj/vehicle/ridden/janicart/upgraded
 	floorbuffer = TRUE
 
-//Boomer-mobile Lawnmower
+//Lawnmower
+//For those who want to play farm simulator 503
 
 /obj/vehicle/ridden/lawnmower
 	name = "lawn mower"
@@ -151,20 +152,29 @@
 /obj/vehicle/ridden/lawnmower/proc/mow_lawn()
 	//Nearly copypasted from goats
 	var/mowed = FALSE
-	var/obj/structure/spacevine/SV = locate(/obj/structure/spacevine) in loc
-	if(SV)
-		SV.eat(src)
+	var/obj/structure/spacevine/spacevine = locate(/obj/structure/spacevine) in loc
+	if(spacevine)
+		qdel(spacevine)
 		mowed = TRUE
 
-	var/obj/structure/glowshroom/GS = locate(/obj/structure/glowshroom) in loc
-	if(GS)
-		qdel(GS)
+	var/obj/structure/glowshroom/glowshroom = locate(/obj/structure/glowshroom) in loc
+	if(glowshroom)
+		qdel(glowshroom)
 		mowed = TRUE
 
-	var/obj/structure/alien/weeds/AW = locate(/obj/structure/alien/weeds) in loc
-	if(AW)
-		qdel(AW)
+	var/obj/structure/alien/weeds/ayy_weeds = locate(/obj/structure/alien/weeds) in loc
+	if(ayy_weeds)
+		qdel(ayy_weeds)
 		mowed = TRUE
 
+	var/obj/structure/flora/flora = locate(/obj/structure/flora) in loc
+	if(ayy_weeds)
+		if(!istype(flora, /obj/structure/flora/rock))
+			qdel(flora)
+			mowed = TRUE
+		else
+			take_damage(25)
+			visible_message("<span class='danger'>\the [src] makes a awful grinding sound as it drives over [flora]!</span>")
+
 	if(mowed)
 		playsound(loc, pick(drive_sounds), 50, 1)