Merged taucetistation/tauceti/base into underground_zas

baystation12.dme

@@ -53,8 +53,11 @@
 #include "code\_onclick\hud\action.dm"
 #include "code\_onclick\hud\ai.dm"
 #include "code\_onclick\hud\alert.dm"
+#include "code\_onclick\hud\alien.dm"
+#include "code\_onclick\hud\facehugger.dm"
 #include "code\_onclick\hud\hud.dm"
 #include "code\_onclick\hud\human.dm"
+#include "code\_onclick\hud\larva.dm"
 #include "code\_onclick\hud\monkey.dm"
 #include "code\_onclick\hud\movable_screen_objects.dm"
 #include "code\_onclick\hud\other_mobs.dm"
@@ -1039,9 +1042,6 @@
 #include "code\modules\mob\living\carbon\alien\facehugger\life.dm"
 #include "code\modules\mob\living\carbon\alien\facehugger\powers.dm"
 #include "code\modules\mob\living\carbon\alien\facehugger\update_icons.dm"
-#include "code\modules\mob\living\carbon\alien\hud\hud_alien.dm"
-#include "code\modules\mob\living\carbon\alien\hud\hud_facehugger.dm"
-#include "code\modules\mob\living\carbon\alien\hud\hud_larva.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
 #include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
@@ -1587,6 +1587,7 @@
 #include "tauceti\modules\_adminverbs\fun_verbs.dm"
 #include "tauceti\modules\_adminverbs\library.dm"
 #include "tauceti\modules\_anomaly\anomalies.dm"
+#include "tauceti\modules\_anomaly\anomaly.dm"
 #include "tauceti\modules\_anomaly\anomaly_bluespace.dm"
 #include "tauceti\modules\_anomaly\anomaly_flux.dm"
 #include "tauceti\modules\_anomaly\anomaly_frost.dm"

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -73,7 +73,7 @@
 /obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
-		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+		user << "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.</span>"
 
 		if(anchored)
 			if(dir & (NORTH|SOUTH))

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -5,7 +5,7 @@
 	icon_state = "intact_off"
 
 	name = "Passive gate"
-	desc = "A one-way air valve that does not require power"
+	desc = "A one-way air valve that does not require power."
 
 	var/on = 0
 	var/target_pressure = ONE_ATMOSPHERE

code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm

@@ -91,7 +91,7 @@
 /obj/machinery/atmospherics/pipeturbine/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
-		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+		user << "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.</span>"
 
 		if(anchored)
 			if(dir & (NORTH|SOUTH))
@@ -263,7 +263,7 @@
 	if(istype(W, /obj/item/weapon/wrench))
 		anchored = !anchored
 		turbine = null
-		user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor."
+		user << "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.</span>"
 		updateConnection()
 	else
 		..()

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -17,7 +17,7 @@ Thus, the two variables affect pump operation are set in New():
 	icon_state = "intact_off"
 
 	name = "Gas pump"
-	desc = "A pump"
+	desc = "A pump."
 
 	var/on = 0
 	var/target_pressure = ONE_ATMOSPHERE
@@ -28,7 +28,7 @@ Thus, the two variables affect pump operation are set in New():
 
 /obj/machinery/atmospherics/binary/pump/highcap
 	name = "High capacity gas pump"
-	desc = "A high capacity pump"
+	desc = "A high capacity pump."
 
 	target_pressure = 15000000
 

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -17,7 +17,7 @@ Thus, the two variables affect pump operation are set in New():
 	icon_state = "intact_off"
 
 	name = "Volumetric gas pump"
-	desc = "A volumetric pump"
+	desc = "A volumetric pump."
 
 	var/on = 0
 	var/transfer_rate = 200

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -87,12 +87,12 @@
 		user << "<span class='warning'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>"
 		add_fingerprint(user)
 		return 1
-	user << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'>You begin to unfasten \the [src]...</span>"
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	if(do_after(user, 40, target = src))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear a ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
 		qdel(src)

code/ATMOSPHERICS/components/tvalve.dm

@@ -3,7 +3,7 @@
 	icon_state = "tvalve0"
 
 	name = "manual switching valve"
-	desc = "A pipe valve"
+	desc = "A pipe valve."
 
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH|WEST

code/ATMOSPHERICS/components/unary/cold_sink.dm

@@ -5,7 +5,7 @@
 	use_power = 1
 
 	name = "Cold Sink"
-	desc = "Cools gas when connected to pipe network"
+	desc = "Cools gas when connected to pipe network."
 
 	var/on = 0
 

code/ATMOSPHERICS/components/unary/generator_input.dm

@@ -4,7 +4,7 @@
 	density = 1
 
 	name = "Generator Input"
-	desc = "Placeholder"
+	desc = "Placeholder."
 
 	var/update_cycle
 

code/ATMOSPHERICS/components/unary/heat_exchanger.dm

@@ -5,7 +5,7 @@
 	density = 1
 
 	name = "Heat Exchanger"
-	desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
+	desc = "Exchanges heat between two input gases. Setup for fast heat transfer."
 
 	var/obj/machinery/atmospherics/unary/heat_exchanger/partner = null
 	var/update_cycle

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -7,7 +7,7 @@
 	use_power = 1
 
 	name = "Heat Reservoir"
-	desc = "Heats gas when connected to pipe network"
+	desc = "Heats gas when connected to pipe network."
 
 	var/on = 0
 

code/ATMOSPHERICS/components/unary/outlet_injector.dm

@@ -4,7 +4,7 @@
 	use_power = 1
 
 	name = "Air Injector"
-	desc = "Has a valve and pump attached to it"
+	desc = "Has a valve and pump attached to it."
 
 	var/on = 0
 	var/injecting = 0

code/ATMOSPHERICS/components/unary/thermal_plate.dm

@@ -9,7 +9,7 @@
 	icon_state = "intact_off"
 
 	name = "Thermal Transfer Plate"
-	desc = "Transfers heat to and from an area"
+	desc = "Transfers heat to and from an area."
 
 	update_icon()
 		if(node)

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -8,7 +8,7 @@
 	icon_state = "off"
 
 	name = "Air Vent"
-	desc = "Has a valve and pump attached to it"
+	desc = "Has a valve and pump attached to it."
 	use_power = 1
 
 	var/area/initial_loc

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -3,7 +3,7 @@
 	icon_state = "off"
 
 	name = "Air Scrubber"
-	desc = "Has a valve and pump attached to it"
+	desc = "Has a valve and pump attached to it."
 	use_power = 1
 
 	level = 1

code/ATMOSPHERICS/components/valve.dm

@@ -3,7 +3,7 @@
 	icon_state = "valve0"
 
 	name = "manual valve"
-	desc = "A pipe valve"
+	desc = "A pipe valve."
 
 	dir = SOUTH
 	initialize_directions = SOUTH|NORTH

code/ATMOSPHERICS/mainspipe.dm

@@ -119,7 +119,7 @@
 /************-Simple pipe-************/
 /obj/machinery/atmospherics/mains_pipe/simple
 	name = "mains pipe"
-	desc = "A one meter section of 3-line mains pipe"
+	desc = "A one meter section of 3-line mains pipe."
 
 	dir = SOUTH
 	initialize_mains_directions = SOUTH|NORTH
@@ -205,7 +205,7 @@
 /************-Manifold pipe-************/
 /obj/machinery/atmospherics/mains_pipe/manifold
 	name = "manifold pipe"
-	desc = "A manifold composed of mains pipes"
+	desc = "A manifold composed of mains pipes."
 
 	dir = SOUTH
 	initialize_mains_directions = EAST|NORTH|WEST
@@ -273,7 +273,7 @@
 /************-Manifold4w pipe-************/
 /obj/machinery/atmospherics/mains_pipe/manifold4w
 	name = "manifold pipe"
-	desc = "A manifold composed of mains pipes"
+	desc = "A manifold composed of mains pipes."
 
 	dir = SOUTH
 	initialize_mains_directions = EAST|NORTH|WEST|SOUTH
@@ -547,7 +547,7 @@
 /************-Cup-************/
 /obj/machinery/atmospherics/mains_pipe/cap
 	name = "pipe cap"
-	desc = "A cap for the end of a mains pipe"
+	desc = "A cap for the end of a mains pipe."
 
 	dir = SOUTH
 	initialize_directions = SOUTH

code/ATMOSPHERICS/pipes.dm

@@ -79,11 +79,11 @@
 		add_fingerprint(user)
 		return 1
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-	user << "\blue You begin to unfasten \the [src]..."
+	user << "<span class='notice'> You begin to unfasten \the [src]...</span>"
 	if (do_after(user, 40, target = src))
 		user.visible_message( \
 			"[user] unfastens \the [src].", \
-			"\blue You have unfastened \the [src].", \
+			"<span class='notice'>You have unfastened \the [src].</span>", \
 			"You hear ratchet.")
 		new /obj/item/pipe(loc, make_from=src)
 		for (var/obj/machinery/meter/meter in T)
@@ -99,7 +99,7 @@
 	icon = 'icons/obj/pipes.dmi'
 
 	name = "pipe"
-	desc = "A one meter section of regular pipe"
+	desc = "A one meter section of regular pipe."
 
 	volume = 70
 
@@ -323,7 +323,7 @@
 	icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
 
 	name = "pipe manifold"
-	desc = "A manifold composed of regular pipes"
+	desc = "A manifold composed of regular pipes."
 
 	volume = 105
 
@@ -522,7 +522,7 @@
 	icon = 'icons/obj/atmospherics/pipe_manifold.dmi'
 
 	name = "4-way pipe manifold"
-	desc = "A manifold composed of regular pipes"
+	desc = "A manifold composed of regular pipes."
 
 	volume = 140
 
@@ -701,7 +701,7 @@ obj/machinery/atmospherics/pipe/manifold4w/New()
 /************-Cap-************/
 /obj/machinery/atmospherics/pipe/cap
 	name = "pipe endcap"
-	desc = "An endcap for pipes"
+	desc = "An endcap for pipes."
 	icon = 'icons/obj/pipes.dmi'
 	icon_state = "cap"
 	level = 2
@@ -980,7 +980,7 @@ obj/machinery/atmospherics/pipe/cap/update_icon()
 	icon_state = "intact"
 
 	name = "Vent"
-	desc = "A large air vent"
+	desc = "A large air vent."
 
 	level = 1
 

code/ZAS/Fire.dm

@@ -63,6 +63,11 @@ Attach to transfer valve and open. BOOM.
 
 	var/firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel()
 
+/obj/fire/Crossed(mob/living/L)
+	..()
+	if(isliving(L))
+		L.fire_act()
+
 /obj/fire/process()
 	. = 1
 
@@ -95,8 +100,7 @@ Attach to transfer valve and open. BOOM.
 
 	//check if there is something to combust
 	if(!air_contents.check_combustability(liquid))
-		//qdel(src)
-		RemoveFire()
+		qdel(src)
 		return
 
 	//get a firelevel and set the icon
@@ -115,11 +119,7 @@ Attach to transfer valve and open. BOOM.
 	//im not sure how to implement a version that works for every creature so for now monkeys are firesafe
 	for(var/mob/living/carbon/human/M in loc)
 		M.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure() ) //Burn the humans!
-		M.fire_act()
-	for(var/mob/living/carbon/monkey/A in loc)
-		A.fire_act()
-	for(var/mob/living/carbon/alien/humanoid/X in loc)
-		X.fire_act()
+
 	loc.fire_act(air_contents, air_contents.temperature, air_contents.return_volume())
 	for(var/atom/A in loc)
 		A.fire_act(air_contents, air_contents.temperature, air_contents.return_volume())
@@ -179,14 +179,12 @@ Attach to transfer valve and open. BOOM.
 	firelevel = fl
 	air_master.active_hotspots.Add(src)
 
-/obj/fire/Destroy()
-	if (istype(loc, /turf/simulated))
-		set_light(0)
-
-		loc = null
-	air_master.active_hotspots.Remove(src)
+	for(var/mob/living/L in loc)
+		L.fire_act()
 
-	..()
+/obj/fire/Destroy()
+	RemoveFire()
+	return ..()
 
 /obj/fire/proc/RemoveFire()
 	if (istype(loc, /turf/simulated))
@@ -196,9 +194,9 @@ Attach to transfer valve and open. BOOM.
 
 
 
-turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
-turf/proc/apply_fire_protection()
-turf/simulated/apply_fire_protection()
+/turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again.
+/turf/proc/apply_fire_protection()
+/turf/simulated/apply_fire_protection()
 	fire_protection = world.time
 
 

code/ZAS/Phoron.dm

@@ -3,7 +3,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 /pl_control
 	var/PHORON_DMG = 5
 	var/PHORON_DMG_NAME = "Phoron Damage Amount"
-	var/PHORON_DMG_DESC = "Self Descriptive"
+	var/PHORON_DMG_DESC = "Self Descriptive."
 
 	var/CLOTH_CONTAMINATION = 1
 	var/CLOTH_CONTAMINATION_NAME = "Cloth Contamination"
@@ -27,7 +27,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 
 	var/CONTAMINATION_LOSS = 0.075
 	var/CONTAMINATION_LOSS_NAME = "Contamination Loss"
-	var/CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing" //Per tick?  ASK ARYN
+	var/CONTAMINATION_LOSS_DESC = "How much toxin damage is dealt from contaminated clothing." //Per tick?  ASK ARYN
 
 	var/PHORON_HALLUCINATION = 1
 	var/PHORON_HALLUCINATION_NAME = "Phoron Hallucination"

code/ZAS/Variable Settings.dm

@@ -11,11 +11,11 @@ var/global/vs_control/vsc = new
 
 	var/fire_fuel_energy_release = 397000
 	var/fire_fuel_energy_release_NAME = "Fire - Fuel energy release"
-	var/fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance"
+	var/fire_fuel_energy_release_DESC = "The energy in joule released when burning one mol of a burnable substance."
 
 
 	var/IgnitionLevel = 0.5
-	var/IgnitionLevel_DESC = "Determines point at which fire can ignite"
+	var/IgnitionLevel_DESC = "Determines point at which fire can ignite."
 
 	var/airflow_lightest_pressure = 20
 	var/airflow_lightest_pressure_NAME = "Airflow - Small Movement Threshold %"