Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

2024-03-08 19:10:22 -03:00
parent fcd036dab5 c4c3a8ace1
commit a65f323734
810 changed files with 140372 additions and 5523 deletions
@@ -278,7 +278,7 @@ we use a hook instead
 /datum/gas_mixture/copy_from_turf(turf/model)
 	set_temperature(initial(model.initial_temperature))
 	parse_gas_string(model.initial_gas_mix)
-	return 1
+	return TRUE

 /datum/gas_mixture/proc/__auxtools_parse_gas_string(gas_string)

@@ -297,7 +297,7 @@ we use a hook instead
 	for(var/id in gas)
 		set_moles(id, text2num(gas[id]))
 	archive()
-	return 1
+	return TRUE
 	*/
 /*
 /datum/gas_mixture/react(datum/holder)
@@ -41,7 +41,7 @@
 		TOTAL_MOLES(cached_gases, .)
 		. *= R_IDEAL_GAS_EQUATION * temperature / volume
 		return
-	return 0
+	return FALSE

 /datum/gas_mixture/return_temperature() //kelvins
 	return temperature
@@ -91,11 +91,11 @@
 /datum/gas_mixture/archive()
 	temperature_archived = temperature
 	gas_archive = gases.Copy()
-	return 1
+	return TRUE

 /datum/gas_mixture/merge(datum/gas_mixture/giver)
 	if(!giver)
-		return 0
+		return FALSE

 	//heat transfer
 	if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
@@ -111,7 +111,7 @@
 	for(var/giver_id in giver_gases)
 		cached_gases[giver_id] += giver_gases[giver_id]

-	return 1
+	return TRUE

 /datum/gas_mixture/remove(amount)
 	var/sum
@@ -172,7 +172,7 @@
 	//remove all gases not in the sample
 	cached_gases &= sample_gases

-	return 1
+	return TRUE

 /datum/gas_mixture/copy_from_turf(turf/model)
 	parse_gas_string(model.initial_gas_mix)
@@ -182,7 +182,7 @@
 	if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
 		temperature = model.temperature

-	return 1
+	return TRUE

 /datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)

@@ -16,10 +16,10 @@
 	if(min2 != -1 && val <= min2)
 		return 2
 	if(max1 != -1 && val >= max1)
-		return 1
+		return TRUE
 	if(min1 != -1 && val <= min1)
-		return 1
-	return 0
+		return TRUE
+	return FALSE

 /datum/tlv/no_checks
 	min2 = -1
@@ -488,16 +488,16 @@

 /obj/machinery/airalarm/proc/shock(mob/user, prb)
 	if((stat & (NOPOWER)))		// unpowered, no shock
-		return 0
+		return FALSE
 	if(!prob(prb))
-		return 0 //you lucked out, no shock for you
+		return FALSE //you lucked out, no shock for you
 	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 	s.set_up(5, 1, src)
 	s.start() //sparks always.
 	if (electrocute_mob(user, get_area(src), src, 1, TRUE))
-		return 1
+		return TRUE
 	else
-		return 0
+		return FALSE

 /obj/machinery/airalarm/proc/refresh_all()
 	var/area/A = get_base_area(src)
@@ -519,7 +519,7 @@

 /obj/machinery/airalarm/proc/send_signal(target, list/command, mob/user)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise
 	if(!radio_connection)
-		return 0
+		return FALSE

 	var/datum/signal/signal = new(command)
 	signal.data["tag"] = target
@@ -527,7 +527,7 @@
 	signal.data["user"] = user
 	radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM)

-	return 1
+	return TRUE

 /obj/machinery/airalarm/proc/get_mode_name(mode_value)
 	switch(mode_value)
@@ -214,7 +214,7 @@
 			if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
 				reagent_transfer = 0

-	return 1
+	return TRUE

 /obj/machinery/atmospherics/components/unary/cryo_cell/process_atmos()
 	..()
@@ -445,7 +445,7 @@
 	return // can't ventcrawl in or out of cryo.

 /obj/machinery/atmospherics/components/unary/cryo_cell/can_see_pipes()
-	return 0 // you can't see the pipe network when inside a cryo cell.
+	return FALSE // you can't see the pipe network when inside a cryo cell.

 /obj/machinery/atmospherics/components/unary/cryo_cell/return_temperature()
 	var/datum/gas_mixture/G = airs[1]
@@ -84,7 +84,7 @@
 		update_parents()
 	else
 		active_power_usage = idle_power_usage
-	return 1
+	return TRUE

 /obj/machinery/atmospherics/components/unary/thermomachine/power_change()
 	..()
@@ -194,7 +194,7 @@

 /obj/machinery/atmospherics/components/unary/vent_scrubber/receive_signal(datum/signal/signal)
 	if(!is_operational() || !signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
-		return 0
+		return FALSE

 	var/mob/signal_sender = signal.data["user"]

@@ -186,7 +186,7 @@
 				self_temperature_delta = -heat/total_heat_capacity
 				sharer_temperature_delta = heat/sharer_heat_capacity
 			else
-				return 1
+				return TRUE

 			air.set_temperature(air.return_temperature() + self_temperature_delta)
 			modeled_location.TakeTemperature(sharer_temperature_delta)
@@ -57,18 +57,18 @@
 /obj/machinery/meter/process_atmos()
 	if(!(target?.flags_1 & INITIALIZED_1))
 		icon_state = "meterX"
-		return 0
+		return FALSE

 	if(stat & (BROKEN|NOPOWER))
 		icon_state = "meter0"
-		return 0
+		return FALSE

 	use_power(5)

 	var/datum/gas_mixture/environment = target.return_air()
 	if(!environment)
 		icon_state = "meterX"
-		return 0
+		return FALSE

 	var/env_pressure = environment.return_pressure()
 	if(env_pressure <= 0.15*ONE_ATMOSPHERE)
@@ -76,7 +76,7 @@
 	parent = P

 /obj/machinery/atmospherics/pipe/zap_act(power, zap_flags)
-	return 0 // they're not really machines in the normal sense, probably shouldn't explode
+	return FALSE // they're not really machines in the normal sense, probably shouldn't explode

 /obj/machinery/atmospherics/pipe/Destroy()
 	QDEL_NULL(parent)
@@ -110,7 +110,7 @@

 /obj/machinery/atmospherics/pipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
 	if(damage_flag == MELEE && damage_amount < 12)
-		return 0
+		return FALSE
 	. = ..()

 /obj/machinery/atmospherics/pipe/proc/paint(paint_color)
@@ -388,7 +388,7 @@
 		return
 	switch(action)
 		if("relabel")
-			var/label = input("New canister label:", name) as null|anything in sortList(label2types)
+			var/label = input("New canister label:", name) as null|anything in sort_list(label2types)
 			if(label && !..())
 				var/newtype = label2types[label]
 				if(newtype)
@@ -21,7 +21,7 @@
 	air_contents = new(volume)
 	air_contents.set_temperature(T20C)

-	return 1
+	return TRUE

 /obj/machinery/portable_atmospherics/Destroy()
 	SSair.atmos_machinery -= src