Merge branch 'master' of https://github.com/butmun/Interpost-Hague

code/controllers/subsystems/machines.dm

@@ -5,9 +5,9 @@
 
 #define START_PROCESSING_IN_LIST(Datum, List) \
 if (Datum.is_processing) {\
-	if(Datum.is_processing != #Processor)\
+	if(Datum.is_processing != "SSmachines.[#List]")\
 	{\
-		crash_with("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \
+		crash_with("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt cured occured [#List]."); \
 	}\
 } else {\
 	Datum.is_processing = "SSmachines.[#List]";\

code/game/objects/items/weapons/dna_injector.dm

@@ -593,4 +593,4 @@
 	//block = 14
 	New()
 		block = GLOB.MONKEYBLOCK
-..()
+		..()

code/modules/client/preference_setup/_defines.dm

@@ -3,7 +3,7 @@
 #define EQUIP_PREVIEW_ALL (EQUIP_PREVIEW_LOADOUT|EQUIP_PREVIEW_JOB)
 
 #define SETUP_SUBTYPE_DECLS_BY_NAME(decl_prototype, decls_by_name) \
-if(!decls_by_name);\
+if(!decls_by_name) \
 {\
 	decls_by_name = list();\
 	var/decls_by_type = decls_repository.get_decls_of_subtype(decl_prototype);\
@@ -13,4 +13,4 @@ if(!decls_by_name);\
 		ADD_SORTED(decls_by_name, decl_instance.name, /proc/cmp_text_asc);\
 		decls_by_name[decl_instance.name] = decl_instance;\
 	}\
-}
+}

code/modules/integrated_electronics/prefab/prefabs.dm

@@ -10,17 +10,17 @@
 			circuit_type = /obj/item/integrated_circuit/input/teleporter_locator
 		},
 		/datum/ic_assembly_integrated_circuits { // 3,
-			circuit_type = /obj/item/integrated_circuit/input/button
+			circuit_type = /obj/item/integrated_circuit/input/button;
 			circuit_name = "Open Rift"
 		}
 	)
 	connections = newlist(
 		/datum/ic_assembly_connection/output_to_input {
-			circuit_index_a = 2 // Teleport Control Locator to
+			circuit_index_a = 2; // Teleport Control Locator to
 			circuit_index_b = 1 // Bluespace Generator Input
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 1 // Open Rift (button) to
+			circuit_index_a = 1; // Open Rift (button) to
 			circuit_index_b = 3 // Bluespace Rift Generator
 		}
 	)
@@ -44,15 +44,15 @@
 			circuit_type = /obj/item/integrated_circuit/memory/constant
 		},
 		/datum/ic_assembly_integrated_circuits { // 5,
-			circuit_type = /obj/item/integrated_circuit/output/led/red
+			circuit_type = /obj/item/integrated_circuit/output/led/red;
 			circuit_name = "Arming"
 		},
 		/datum/ic_assembly_integrated_circuits { // 6,
-			circuit_type = /obj/item/integrated_circuit/output/led/red
+			circuit_type = /obj/item/integrated_circuit/output/led/red;
 			circuit_name = "Armed"
 		},
 		/datum/ic_assembly_integrated_circuits { // 7 - Starts the whole setup,
-			circuit_type = /obj/item/integrated_circuit/input/button
+			circuit_type = /obj/item/integrated_circuit/input/button;
 			circuit_name = "Arm"
 		},
 		/datum/ic_assembly_integrated_circuits { // 8 - Audible warning 1,
@@ -70,84 +70,84 @@
 	)
 	value_presets = newlist(
 		/datum/ic_assembly_value_preset/output {
-			circuit_index = 4 // Give Constant a value of
+			circuit_index = 4; // Give Constant a value of
 			value = 1
 		},
 		/datum/ic_assembly_value_preset/input {
-			circuit_index = 8 // Give Beeper - Sound a value of
+			circuit_index = 8; // Give Beeper - Sound a value of
 			value = "beep"
 		},
 		/datum/ic_assembly_value_preset/input {
-			circuit_index = 8 // Give Beeper - Volume a value of
-			value = 50
+			circuit_index = 8; // Give Beeper - Volume a value of
+			value = 50;
 			io_pin_index = 2
 		},
 		/datum/ic_assembly_value_preset/input {
-			circuit_index = 9 // Give Beepsky - Sound a value of
+			circuit_index = 9; // Give Beepsky - Sound a value of
 			value = "freeze"
 		},
 		/datum/ic_assembly_value_preset/input {
-			circuit_index = 9 // Give Beepsky - Volume a value of
-			value = 50
+			circuit_index = 9; // Give Beepsky - Volume a value of
+			value = 50;
 			io_pin_index = 2
 		},
 		/datum/ic_assembly_value_preset/input {
-			circuit_index = 1 // Give !Grenade! a detonation time of
+			circuit_index = 1; // Give !Grenade! a detonation time of
 			value = 1
 		}
 	)
 	connections = newlist(
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 7 // Button to
+			circuit_index_a = 7; // Button to
 			circuit_index_b = 3 // Timed Delay
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 7 // Button to
+			circuit_index_a = 7; // Button to
 			circuit_index_b = 4 // Constant
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 7 // Button to
+			circuit_index_a = 7; // Button to
 			circuit_index_b = 8 // Beeper
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 3  // Timed Delay to
-			circuit_index_b = 11 // Splitter
+			circuit_index_a = 3;  // Timed Delay to
+			circuit_index_b = 11; // Splitter
 			io_pin_index_a = 2   // Outgoing pulse
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 11 // Splitter to
-			circuit_index_b = 9  // Beepsky
+			circuit_index_a = 11; // Splitter to
+			circuit_index_b = 9;  // Beepsky
 			io_pin_index_a = 2   // Trigger first
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 11 // Splitter to
-			circuit_index_b = 10 // Memory
+			circuit_index_a = 11; // Splitter to
+			circuit_index_b = 10; // Memory
 			io_pin_index_a = 3   // Trigger second
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 11 // Splitter
-			circuit_index_b = 2  // Proximity Sensor
+			circuit_index_a = 11; // Splitter
+			circuit_index_b = 2;  // Proximity Sensor
 			io_pin_index_a = 4   // Trigger last
 		},
 		/datum/ic_assembly_connection/activator_to_activator {
-			circuit_index_a = 2 // Proximity Sensor to
-			circuit_index_b = 1 // !Grenade! when
+			circuit_index_a = 2; // Proximity Sensor to
+			circuit_index_b = 1; // !Grenade! when
 			io_pin_index_a = 2  // Sensor Trigger
 		},
 		/datum/ic_assembly_connection/output_to_input {
-			circuit_index_a = 4 // Constant to
+			circuit_index_a = 4; // Constant to
 			circuit_index_b = 5 // Arming LED
 		},
 		/datum/ic_assembly_connection/output_to_input {
-			circuit_index_a = 4 // Constant to
+			circuit_index_a = 4; // Constant to
 			circuit_index_b = 10 // Memory
 		},
 		/datum/ic_assembly_connection/output_to_input {
-			circuit_index_a = 10 // Memory to
+			circuit_index_a = 10; // Memory to
 			circuit_index_b = 6  // Armed LED
 		},
 		/datum/ic_assembly_connection/output_to_input {
-			circuit_index_a = 10 // Memory to
+			circuit_index_a = 10; // Memory to
 			circuit_index_b = 2  // Proximity Sensor
 		}
 	)

code/modules/mob/living/carbon/human/human.dm

@@ -1701,7 +1701,7 @@ var/list/rank_prefix = list(\
 	var/obj/item/organ/external/E = get_organ(def_zone)
 	if(!E || E.is_stump())
 		return BULLET_IMPACT_NONE
-	if(ORGAN_ROBOT(E))
+	if(BP_IS_ROBOTIC(E))
 		return BULLET_IMPACT_METAL
 	return BULLET_IMPACT_MEAT
 

code/modules/mob/living/deity/deity_Stat.dm

@@ -9,7 +9,7 @@
 		var/boon_name = "None"
 		if(current_boon)
 			if(istype(current_boon, /spell))
-				var/spell/S = current_boon.
+				var/spell/S = current_boon
 				boon_name = S.name
 			else
 				var/obj/O = current_boon

code/modules/modular_computers/computers/modular_computer/interaction.dm

@@ -244,9 +244,9 @@
 	..()
 
 /obj/item/modular_computer/examine(var/mob/user)
-	. = ..()
 
-		to_chat(user, "The time [stationtime2text()] is displayed in the corner of the screen.")
+	. = ..()
+	to_chat(user, "The time [stationtime2text()] is displayed in the corner of the screen.")
 
 	if(card_slot && card_slot.stored_card)
 		to_chat(user, "The [card_slot.stored_card] is inserted into it.")

code/modules/paperwork/carbonpaper.dm

@@ -2,8 +2,8 @@
 	name = "paper"
 	icon_state = "paper_stack"
 	item_state = "paper"
-	var copied = 0
-	var iscopy = 0
+	var/copied = 0
+	var/iscopy = 0
 
 
 /obj/item/weapon/paper/carbon/update_icon()

code/modules/power/singularity/collector.dm

@@ -16,8 +16,8 @@ var/global/list/rad_collectors = list()
 	var/locked = 0
 	var/drainratio = 1
 
-/obj/machinery/power/rad_collector/New()
-	..()
+/obj/machinery/power/rad_collector/Initialize()
+	. = ..()
 	rad_collectors += src
 
 /obj/machinery/power/rad_collector/Destroy()
@@ -42,7 +42,6 @@ var/global/list/rad_collectors = list()
 			P.air_contents.adjust_gas("phoron", -0.001*drainratio)
 	return
 
-
 /obj/machinery/power/rad_collector/attack_hand(mob/user as mob)
 	if(anchored)
 		if(!src.locked)
@@ -54,7 +53,7 @@ var/global/list/rad_collectors = list()
 		else
 			to_chat(user, "<span class='warning'>The controls are locked!</span>")
 			return
-..()
+
 
 
 /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user)

code/modules/spells/targeted/cleric_spells.dm

@@ -16,6 +16,7 @@
 
 	amt_dam_brute = -15
 	amt_dam_fire = -5
+	amt_dam_robo = -4
 
 	message = "You feel a pleasant rush of heat move through your body."
 
@@ -24,6 +25,8 @@
 		return 0
 	amt_dam_brute -= 15
 	amt_dam_fire -= 15
+	amt_dam_robo = -4
+	amt_dam_robo = -7
 
 	return "[src] will now heal more."
 
@@ -41,6 +44,7 @@
 
 	amt_dam_brute = -75
 	amt_dam_fire  = -50
+	amt_dam_robo = -15
 	amt_blood  = 28
 
 	message = "Your body feels like a furnace."
@@ -56,6 +60,7 @@
 	amt_dam_oxy = -14
 	amt_dam_brute = -35
 	amt_dam_fire  = -35
+	amt_dam_robo = -10
 
 	return "[src] heals more, and heals organ damage and radiation."
 
@@ -72,6 +77,7 @@
 	cooldown_reduc = 300
 	hud_state = "heal_area"
 
+	amt_dam_robo = -6
 	amt_dam_brute = -25
 	amt_dam_fire = -25
 
@@ -100,6 +106,7 @@
 	amt_dam_fire = -1000
 	amt_dam_oxy = -100
 	amt_dam_tox = -100
+	amt_dam_robo = -1000
 	amt_blood  = 280
 
 	hud_state = "gen_dissolve"

code/modules/spells/targeted/targeted.dm

@@ -22,6 +22,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
 	var/amt_dam_brute = 0
 	var/amt_dam_oxy = 0
 	var/amt_dam_tox = 0
+	var/amt_dam_robo = 0
 	var/amt_brain = 0
 	var/amt_radiation = 0
 	var/amt_blood = 0 //Positive numbers to add blood
@@ -137,9 +138,13 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
 	target.adjustOxyLoss(amt_dam_oxy)
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = target
-		for(var/obj/item/organ/external/affecting in H.organs)
+		for(var/obj/item/organ/internal/affecting in H.internal_organs)
 			if(affecting && istype(affecting))
 				affecting.heal_damage(amt_organ, amt_organ)
+		for(var/obj/item/organ/external/affecting in H.organs)
+			if(affecting && istype(affecting))
+				var/dam = BP_IS_ROBOTIC(affecting) ? -amt_dam_robo : amt_organ
+				affecting.heal_damage(dam, dam, robo_repair = BP_IS_ROBOTIC(affecting))
 		H.vessel.add_reagent(/datum/reagent/blood,amt_blood)
 		H.adjustBrainLoss(amt_brain)
 		H.radiation += min(H.radiation, amt_radiation)

maps/frontier/frontier-3.dmm

@@ -589,7 +589,7 @@
 "lq" = (/obj/effect/floor_decal/newcorner/teal/corner{tag = "icon-teal-corner (WEST)"; icon_state = "teal-corner"; dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "lr" = (/obj/effect/floor_decal/newcorner/teal,/obj/effect/floor_decal/newcorner/teal/corner{tag = "icon-teal-corner (WEST)"; icon_state = "teal-corner"; dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "ls" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/newcorner/teal{tag = "icon-teal (EAST)"; icon_state = "teal"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
-"lt" = (/obj/effect/floor_decal/newcorner/whitegreen/quarter{tag = "icon-wgreen-quarter (NORTH)"; icon_state = "wgreen-quarter"; dir = 1},/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/beaker,/turf/simulated/floor/tiled/verybright,/area/medical/genetics_cloning)
+"lt" = (/obj/effect/floor_decal/newcorner/whitegreen/quarter{tag = "icon-wgreen-quarter (NORTH)"; icon_state = "wgreen-quarter"; dir = 1},/obj/machinery/dna_scannernew,/turf/simulated/floor/tiled/verybright,/area/medical/genetics_cloning)
 "lu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/newcorner/teal/corner{icon_state = "teal-corner"; dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_two)
 "lv" = (/obj/effect/floor_decal/newcorner/whitegreen{tag = "icon-wgreen (NORTH)"; icon_state = "wgreen"; dir = 1},/obj/structure/table/reinforced,/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/fancy/vials,/turf/simulated/floor/tiled/verybright,/area/medical/genetics_cloning)
 "lw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay)