Merge branch 'master' into emptysectorx24

aurorastation.dme

@@ -111,6 +111,7 @@
 #include "code\__DEFINES\rust_g_overrides.dm"
 #include "code\__DEFINES\ship_weapons.dm"
 #include "code\__DEFINES\shuttle.dm"
+#include "code\__DEFINES\si.dm"
 #include "code\__DEFINES\singletons.dm"
 #include "code\__DEFINES\smart_token_bucket.dm"
 #include "code\__DEFINES\solar.dm"

code/__DEFINES/machinery.dm

@@ -1,6 +1,5 @@
-#define KILOWATTS *1000
-#define MEGAWATTS *1000000
-#define GIGAWATTS *1000000000
+//Watts, yes this is stupid but it's just for visual reference to the code reader, so deal with it
+#define WATTS *1
 
 /**
  * Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)

code/__DEFINES/si.dm

@@ -0,0 +1,21 @@
+// Prefix values.
+#define QUECTO * 1e-30
+#define RONTO * 1e-27
+#define YOCTO * 1e-24
+#define ZEPTO * 1e-21
+#define ATTO * 1e-18
+#define FEMPTO * 1e-15
+#define PICO * 1e-12
+#define NANO * 1e-9
+#define MICRO * 1e-6
+#define MILLI * 1e-3
+#define KILO * 1e3
+#define MEGA * 1e6
+#define GIGA * 1e9
+#define TERA * 1e12
+#define PETA * 1e15
+#define EXA * 1e18
+#define ZETTA * 1e21
+#define YOTTA * 1e24
+#define RONNA * 1e27
+#define QUETTA * 1e30

code/datums/ruins.dm

@@ -40,11 +40,30 @@
 	 */
 	var/list/sectors_blacklist = list()
 
-	/// Prefix part of the path to the dmm maps.
+	/**
+	 * Static part of the ruin path, ie the folder
+	 * have to start without a slash, and end with a slash
+	 *
+	 * eg. `away_site/`
+	 *
+	 * Gets combined with the other prefixes in the inheritance tree
+	 * (under /New()) to form the relative path from the root of the codebase
+	 * to the folder this ruin is in
+	 *
+	 * If you implement a subtype of another subtype, it is *your* responsibility to
+	 * ensure that `/New()` chains the path correctly
+	 */
 	var/prefix = null
 
-	/// A list of suffix parts of paths of the dmm maps.
-	/// Combined with prefix to get the actual path.
+	/**
+	 * The dynamic part of the ruin path, ie the files
+	 *
+	 * A `/list` with only the file names of the DMM files
+	 *
+	 * eg. `my_awesome_ruin.dmm`
+	 *
+	 * Gets combined with the prefix to form the path to the map files, that are loaded when the ruin loads
+	 */
 	var/list/suffixes = null
 
 	/// Template flags for this ruin
@@ -59,7 +78,13 @@
 	///Listed ruins are removed from the set of available spawns
 	var/list/ban_ruins
 
-/datum/map_template/ruin/New()
+/**
+ * Ensure to call the parent constructor *last*
+ *
+ * If you have subtypes and you change the `prefix`, it is *your* responsibility to
+ * chain your changed `prefix` here, before calling the parent constructor
+ */
+/datum/map_template/ruin/New(var/list/paths = null, rename = null)
 	// get the map paths
 	if (suffixes)
 		mappaths = list()

code/datums/uplink/devices_and_tools.dm

@@ -257,3 +257,9 @@
 	telecrystal_cost = 4
 	bluecrystal_cost = 4
 	path = /obj/item/recharger_backpack/high
+
+/datum/uplink_item/item/tools/camera_mask
+	name = "Camera MIU"
+	desc = "A mask which allows the wearer to view local camera feeds they have access to."
+	telecrystal_cost = 6
+	path = /obj/item/clothing/mask/ai

code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm

@@ -206,7 +206,7 @@
 	if(!ability_pay(user,price))
 		return
 
-	M.use_power_oneoff(250 KILOWATTS)
+	M.use_power_oneoff(250 KILO WATTS)
 
 	// Trigger a powernet alarm. Careful engineers will probably notice something is going on.
 	var/area/temp_area = get_area(M)

code/game/machinery/OpTable.dm

@@ -221,7 +221,7 @@
 			if(stat & NOPOWER)
 				return FALSE
 
-			src.use_power_oneoff(2 KILOWATTS)
+			src.use_power_oneoff(2 KILO WATTS)
 
 			//Set it to unwillful sleep
 			occupant_resolved.Sleeping(3.5*seconds_per_tick)

code/game/machinery/cell_charger.dm

@@ -6,7 +6,7 @@
 	icon_state = "ccharger"
 	anchored = TRUE
 	idle_power_usage = 5
-	active_power_usage = 90 KILOWATTS
+	active_power_usage = 90 KILO WATTS
 	power_channel = EQUIP
 	update_icon_on_init = TRUE
 

code/game/machinery/crusher_piston.dm

@@ -402,7 +402,7 @@
 	QDEL_NULL(pb3)
 
 /obj/machinery/crusher_piston/proc/extend_0_1()
-	use_power_oneoff(5 KILOWATTS)
+	use_power_oneoff(5 KILO WATTS)
 	var/turf/T = get_turf(src)
 	if(!can_extend_into(T))
 		return 0
@@ -414,7 +414,7 @@
 	return 1
 
 /obj/machinery/crusher_piston/proc/extend_1_2()
-	use_power_oneoff(5 KILOWATTS)
+	use_power_oneoff(5 KILO WATTS)
 	var/turf/T = get_turf(pb1)
 	var/turf/extension_turf = get_step(T,SOUTH)
 	if(!can_extend_into(extension_turf))
@@ -427,7 +427,7 @@
 	return 1
 
 /obj/machinery/crusher_piston/proc/extend_2_3()
-	use_power_oneoff(5 KILOWATTS)
+	use_power_oneoff(5 KILO WATTS)
 	var/turf/T = get_turf(pb2)
 	var/turf/extension_turf = get_step(T,SOUTH)
 	if(!can_extend_into(extension_turf))

code/game/machinery/from_beyond.dm

@@ -7,8 +7,8 @@
 	anchored = 0
 	density = 1
 
-	idle_power_usage = 1 KILOWATTS
-	active_power_usage = 10 KILOWATTS
+	idle_power_usage = 1 KILO WATTS
+	active_power_usage = 10 KILO WATTS
 
 	var/active = FALSE
 	var/static/list/whispers = list(

code/game/machinery/mech_recharger.dm

@@ -7,11 +7,11 @@
 	layer = ABOVE_TILE_LAYER
 	anchored = TRUE
 	idle_power_usage = 300	// Some electronics, passive drain.
-	active_power_usage = 90 KILOWATTS // When charging
+	active_power_usage = 90 KILO WATTS // When charging
 
 	var/mob/living/heavy_vehicle/charging
-	var/base_charge_rate = 90 KILOWATTS
-	var/repair_power_usage = 15 KILOWATTS		// Per 1 HP of health.
+	var/base_charge_rate = 90 KILO WATTS
+	var/repair_power_usage = 15 KILO WATTS		// Per 1 HP of health.
 	var/repair = 0
 	var/charge
 
@@ -118,9 +118,9 @@
 	desc = "A massive vehicle dock elevated slightly above the ground, constructed for equally massive charging speeds."
 	icon_state = "supermechcharger"
 	idle_power_usage = 400
-	active_power_usage = 120 KILOWATTS
+	active_power_usage = 120 KILO WATTS
 
-	base_charge_rate = 120 KILOWATTS
+	base_charge_rate = 120 KILO WATTS
 	repair = 1
 
 	component_types = list(

code/game/machinery/navbeacon.dm

@@ -100,7 +100,7 @@
 		return FALSE
 
 	//Wikipedia says this is the upper limit for a medium non directional beacon, deal with it
-	use_power_oneoff(2 KILOWATTS)
+	use_power_oneoff(2 KILO WATTS)
 
 	var/datum/radio_frequency/frequency = SSradio.return_frequency(freq)
 

code/game/machinery/recharger.dm

@@ -7,7 +7,7 @@
 	icon_state = "recharger_off"
 	anchored = 1
 	idle_power_usage = 6
-	active_power_usage = 45 KILOWATTS
+	active_power_usage = 45 KILO WATTS
 	pass_flags = PASSTABLE
 	obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
 	var/charging_efficiency = 1.3
@@ -176,7 +176,7 @@
 	desc = "A heavy duty wall recharger specialized for energy weaponry."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "wrecharger_off"
-	active_power_usage = 75 KILOWATTS
+	active_power_usage = 75 KILO WATTS
 	allowed_devices = list(
 		/obj/item/gun/energy,
 		/obj/item/melee/baton,

code/game/machinery/spaceheater.dm

@@ -9,7 +9,7 @@
 	clicksound = /singleton/sound_category/switch_sound
 	var/on = FALSE
 	var/active = 0
-	var/heating_power = 40 KILOWATTS
+	var/heating_power = 40 KILO WATTS
 	var/set_temperature = T0C + 20
 
 	var/obj/item/cell/apc/cell

code/game/machinery/telecomms/machines/broadcaster.dm

@@ -11,7 +11,7 @@
 	desc = "A dish-shaped machine used to broadcast processed subspace signals."
 	telecomms_type = /obj/machinery/telecomms/broadcaster
 	idle_power_usage = 100 // WATTS
-	active_power_usage = 3 KILOWATTS
+	active_power_usage = 3 KILO WATTS
 	produces_heat = FALSE
 	delay = 7
 	circuitboard = "/obj/item/circuitboard/telecomms/broadcaster"

code/game/machinery/telecomms/machines/bus.dm

@@ -12,8 +12,8 @@
 	icon_state = "bus"
 	desc = "A mighty piece of hardware used to send massive amounts of data quickly."
 	telecomms_type = /obj/machinery/telecomms/bus
-	idle_power_usage = 1 KILOWATTS
-	active_power_usage = 3 KILOWATTS
+	idle_power_usage = 1 KILO WATTS
+	active_power_usage = 3 KILO WATTS
 	circuitboard = "/obj/item/circuitboard/telecomms/bus"
 	netspeed = 40
 	var/change_frequency = 0

code/game/machinery/telecomms/machines/hub.dm

@@ -15,8 +15,8 @@
 	telecomms_type = /obj/machinery/telecomms/hub
 	density = TRUE
 	anchored = TRUE
-	idle_power_usage = 1.6 KILOWATTS
-	active_power_usage = 5 KILOWATTS
+	idle_power_usage = 1.6 KILO WATTS
+	active_power_usage = 5 KILO WATTS
 	circuitboard = "/obj/item/circuitboard/telecomms/hub"
 	netspeed = 40
 

code/game/machinery/telecomms/machines/server.dm

@@ -20,7 +20,7 @@
 	density = TRUE
 	anchored = TRUE
 	idle_power_usage = 300 // WATTS
-	active_power_usage = 1 KILOWATTS
+	active_power_usage = 1 KILO WATTS
 	circuitboard = "/obj/item/circuitboard/telecomms/server"
 	var/list/log_entries = list()
 	var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes)

code/game/machinery/telecomms/telecommunications.dm

@@ -22,7 +22,7 @@
 	density = TRUE
 	anchored = TRUE
 	idle_power_usage = 600 // WATTS
-	active_power_usage = 2 KILOWATTS
+	active_power_usage = 2 KILO WATTS
 
 	var/list/links = list() // list of machines this machine is linked to
 	/*

code/modules/client/preference_setup/loadout/items/augments.dm

@@ -29,12 +29,19 @@
 	whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_IPC_SHELL)
 
 /datum/gear/augment/synthetic_cords
-	display_name = "synthetic vocal cords"
-	description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak."
+	display_name = "synthetic vocal cords selection"
+	description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak. The advanced model allows use of normal accents, while the cheaper basic model will set your accent to text-to-speech."
 	path = /obj/item/organ/internal/augment/synthetic_cords
-	whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
+	whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
 	cost = 1
 
+/datum/gear/augment/synthetic_cords/New()
+	..()
+	var/list/augs = list()
+	augs["synthetic vocal cords, basic"] = /obj/item/organ/internal/augment/synthetic_cords/voice
+	augs["synthetic vocal cords, advanced"] = /obj/item/organ/internal/augment/synthetic_cords
+	gear_tweaks += new /datum/gear_tweak/path(augs)
+
 /datum/gear/augment/combitool
 	display_name = "retractable combitool"
 	description = "An augment that allows the user to deploy a robotic combitool."

code/modules/cooking/machinery/cooking_machines/fryer.dm

@@ -8,10 +8,10 @@
 	off_icon = "fryer_off"
 	food_color = "#ffad33"
 	appliancetype = FRYER
-	active_power_usage = 12 KILOWATTS
+	active_power_usage = 12 KILO WATTS
 	heating_power = 12000
 	optimal_power = 1.35
-	idle_power_usage = 3.6 KILOWATTS
+	idle_power_usage = 3.6 KILO WATTS
 	//Power used to maintain temperature once it's heated.
 	//Going with 25% of the active power. This is a somewhat arbitrary value
 	resistance = 10000	// Approx. 4 minutes.

code/modules/cooking/machinery/cooking_machines/oven.dm

@@ -7,11 +7,11 @@
 	appliancetype = OVEN
 	food_color = "#a34719"
 	can_burn_food = TRUE
-	active_power_usage = 6 KILOWATTS
+	active_power_usage = 6 KILO WATTS
 	heating_power = 6000
 	//Based on a double deck electric convection oven
 	resistance = 10000 // Approx. 4 minutes.
-	idle_power_usage = 2 KILOWATTS
+	idle_power_usage = 2 KILO WATTS
 	//uses ~30% power to stay warm
 	optimal_power = 1.2
 	light_x = 2

code/modules/cooking/machinery/cooking_machines/stove.dm

@@ -6,14 +6,14 @@
 	appliancetype = SKILLET | SAUCEPAN | POT
 	food_color = "#a34719"
 	can_burn_food = TRUE
-	active_power_usage = 6 KILOWATTS
+	active_power_usage = 6 KILO WATTS
 	heating_power = 6000
 	on_icon = "stove"
 	off_icon = "stove"
 	place_verb = "onto"
 
 	resistance = 5000 // Approx. 2 minutes.
-	idle_power_usage = 1 KILOWATTS
+	idle_power_usage = 1 KILO WATTS
 	//uses ~30% power to stay warm
 	optimal_temp = T0C + 100 // can boil water!
 	optimal_power = 1.2

code/modules/heavy_vehicle/equipment/_equipment.dm

@@ -13,7 +13,7 @@
 	var/mech_layer = MECH_GEAR_LAYER
 	var/equipment_delay = 0
 	var/passive_power_use = 0
-	var/active_power_use = 1 KILOWATTS
+	var/active_power_use = 1 KILO WATTS
 	var/require_adjacent = TRUE
 	var/active = FALSE //For gear that has an active state (ie, floodlights)
 

code/modules/heavy_vehicle/equipment/combat.dm

@@ -335,7 +335,7 @@
 	else
 		STOP_PROCESSING(SSprocessing, src)
 	active = aura.active
-	passive_power_use = active ? 1 KILOWATTS : 0
+	passive_power_use = active ? 1 KILO WATTS : 0
 	owner.update_icon()
 
 /obj/item/mecha_equipment/shield/deactivate()

code/modules/heavy_vehicle/equipment/utility.dm

@@ -209,7 +209,7 @@
 	update_icon()
 	owner.update_icon()
 	active = on
-	passive_power_use = on ? 0.1 KILOWATTS : 0
+	passive_power_use = on ? 0.1 KILO WATTS : 0
 
 /obj/item/mecha_equipment/light/deactivate()
 	if(on)
@@ -658,7 +658,7 @@
 	restricted_hardpoints = list(HARDPOINT_BACK)
 	w_class = ITEMSIZE_HUGE
 	origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 6, TECH_BLUESPACE = 6)
-	active_power_use = 88 KILOWATTS
+	active_power_use = 88 KILO WATTS
 
 	var/obj/item/anomaly_core/AC
 	var/image/anomaly_overlay

code/modules/maps/map_template.dm

@@ -26,6 +26,8 @@
 	if(rename)
 		name = rename
 
+	..()
+
 /datum/map_template/proc/preload_size(paths)
 	var/list/bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
 	var/z_offset = 1 // needed to calculate z-bounds correctly