Merge remote-tracking branch 'ParadiseSS13/master' into atmos-refactoring-part-7

Author: AffectedArc07

_maps/map_files/Delta/delta.dmm

@@ -530,6 +530,7 @@
 ///from base of obj/item/hit_reaction(): (list/args)
 #define COMSIG_ITEM_HIT_REACT "item_hit_react"
 	#define COMPONENT_BLOCK_SUCCESSFUL (1 << 0)
+	#define COMPONENT_BLOCK_PERFECT (1 << 2)
 ///called on item when crossed by something (): (/atom/movable, mob/living/crossed)
 #define COMSIG_ITEM_WEARERCROSSED "wearer_crossed"
 ///called on item when microwaved (): (obj/machinery/microwave/M)

_maps/map_files/MetaStation/MetaStation.dmm

@@ -283,10 +283,11 @@ SUBSYSTEM_DEF(air)
 /datum/controller/subsystem/air/proc/add_to_active(turf/simulated/T, blockchanges = 1)
 	if(!initialized)
 		/* it makes no sense to "activate" turfs before setup_allturfs is
-		   called, as setup_allturfs would simply cull the list incorrectly.
-		   only /turf/simulated/Initialize_Atmos() is blessed enough to
-		   activate turfs during this phase of initialization, as it happens
-		   post-cull and inlines the logic (perhaps incorrectly) */
+		 * called, as setup_allturfs would simply cull the list incorrectly.
+		 * only /turf/simulated/Initialize_Atmos() is blessed enough to
+		 * activate turfs during this phase of initialization, as it happens
+		 * post-cull and inlines the logic (perhaps incorrectly)
+		 **/
 		return
 
 	if(istype(T) && T.air)

_maps/map_files/generic/centcomm.dmm

@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(events)
 	// Report events at the end of the rouund
 	var/report_at_round_end = 0
 
-    // UI vars
+	// UI vars
 	var/window_x = 700
 	var/window_y = 600
 	var/table_options = " align='center'"
@@ -16,7 +16,7 @@ SUBSYSTEM_DEF(events)
 	var/row_options2 = " width='260px'"
 	var/row_options3 = " width='150px'"
 
-    // Event vars
+	// Event vars
 	var/datum/event_container/selected_event_container = null
 	var/list/active_events = list()
 	var/list/finished_events = list()

code/__DEFINES/dcs/signals.dm

@@ -1,37 +1,37 @@
 SUBSYSTEM_DEF(npcpool)
-    name = "NPC Pool"
-    flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
-    priority = FIRE_PRIORITY_NPC
-    runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-    offline_implications = "Simple animals will no longer process. Shuttle call recommended."
+	name = "NPC Pool"
+	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	priority = FIRE_PRIORITY_NPC
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+	offline_implications = "Simple animals will no longer process. Shuttle call recommended."
 
-    var/list/currentrun = list()
+	var/list/currentrun = list()
 
 /datum/controller/subsystem/npcpool/get_stat_details()
-    return "SimpleAnimals: [length(GLOB.simple_animals[AI_ON])]"
+	return "SimpleAnimals: [length(GLOB.simple_animals[AI_ON])]"
 
 /datum/controller/subsystem/npcpool/fire(resumed = FALSE)
 
-    if(!resumed)
-        var/list/activelist = GLOB.simple_animals[AI_ON]
-        src.currentrun = activelist.Copy()
+	if(!resumed)
+		var/list/activelist = GLOB.simple_animals[AI_ON]
+		src.currentrun = activelist.Copy()
 
-    var/list/currentrun = src.currentrun
+	var/list/currentrun = src.currentrun
 
-    while(currentrun.len)
-        var/mob/living/simple_animal/SA = currentrun[currentrun.len]
-        --currentrun.len
-        if(!SA)
-            log_debug("npcpool encountered an invalid entry, resumed: [resumed], SA [SA], type of SA [SA?.type], null [SA == null], qdelled [QDELETED(SA)], SA in AI_ON list: [SA in GLOB.simple_animals[AI_ON]]")
-            GLOB.simple_animals[AI_ON] -= SA
-            continue
+	while(currentrun.len)
+		var/mob/living/simple_animal/SA = currentrun[currentrun.len]
+		--currentrun.len
+		if(!SA)
+			log_debug("npcpool encountered an invalid entry, resumed: [resumed], SA [SA], type of SA [SA?.type], null [SA == null], qdelled [QDELETED(SA)], SA in AI_ON list: [SA in GLOB.simple_animals[AI_ON]]")
+			GLOB.simple_animals[AI_ON] -= SA
+			continue
 
-        if(!SA.ckey && !SA.notransform)
-            if(SA.stat != DEAD)
-                SA.handle_automated_movement()
-            if(SA.stat != DEAD)
-                SA.handle_automated_action()
-            if(SA.stat != DEAD)
-                SA.handle_automated_speech()
-        if(MC_TICK_CHECK)
-            return
+		if(!SA.ckey && !SA.notransform)
+			if(SA.stat != DEAD)
+				SA.handle_automated_movement()
+			if(SA.stat != DEAD)
+				SA.handle_automated_action()
+			if(SA.stat != DEAD)
+				SA.handle_automated_speech()
+		if(MC_TICK_CHECK)
+			return

code/controllers/subsystem/air.dm

@@ -1,9 +1,9 @@
 GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets)
 
 /datum/controller/subsystem/tickets/mentor_tickets/New()
-    NEW_SS_GLOBAL(SSmentor_tickets)
-    PreInit()
-    ss_id = "mentor_tickets"
+	NEW_SS_GLOBAL(SSmentor_tickets)
+	PreInit()
+	ss_id = "mentor_tickets"
 
 /datum/controller/subsystem/tickets/mentor_tickets
 	name = "Mentor Tickets"

code/controllers/subsystem/events.dm

@@ -566,7 +566,7 @@ UI STUFF
  * msg - The message being send
  * alt - If an alternative prefix should be used or not. Defaults to TICKET_STAFF_MESSAGE_PREFIX
  * important - If the message is important. If TRUE it will ignore the CHAT_NO_TICKETLOGS preferences,
-               send a sound and flash the window. Defaults to FALSE
+ *             send a sound and flash the window. Defaults to FALSE
  */
 /datum/controller/subsystem/tickets/proc/message_staff(msg, prefix_type = TICKET_STAFF_MESSAGE_PREFIX, important = FALSE)
 	switch(prefix_type)

code/controllers/subsystem/npcpool.dm

@@ -79,10 +79,10 @@ SUBSYSTEM_DEF(weather)
 	next_hit_by_zlevel["[z]"] = null
 
 /datum/controller/subsystem/weather/proc/get_weather(z, area/active_area)
-    var/datum/weather/A
-    for(var/V in processing)
-        var/datum/weather/W = V
-        if((z in W.impacted_z_levels) && W.area_type == active_area)
-            A = W
-            break
-    return A
+	var/datum/weather/A
+	for(var/V in processing)
+		var/datum/weather/W = V
+		if((z in W.impacted_z_levels) && W.area_type == active_area)
+			A = W
+			break
+	return A

code/controllers/subsystem/tickets/mentor_tickets.dm

@@ -402,7 +402,7 @@
 	name = "Activate"
 
 /datum/action/item_action/hands_free/activate/always
-    check_flags = null
+	check_flags = null
 
 /datum/action/item_action/toggle_research_scanner
 	name = "Toggle Research Scanner"

code/controllers/subsystem/tickets/tickets.dm

@@ -1,9 +1,9 @@
 #define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]"
 
 /proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0)
-  . = locate(ARMORID)
-  if (!.)
-    . = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic)
+	. = locate(ARMORID)
+	if (!.)
+		. = new /datum/armor(melee, bullet, laser, energy, bomb, bio, rad, fire, acid, magic)
 
 /datum/armor
 	var/melee

code/controllers/subsystem/weather.dm

@@ -12,6 +12,8 @@
 	var/parryable_attack_types
 	/// the time between parry attempts
 	var/parry_cooldown
+	///Do we wish to mute the parry sound?
+	var/no_parry_sound
 
 /datum/component/parry/RegisterWithParent()
 	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(equipped))
@@ -26,14 +28,15 @@
 	if(ismob(I.loc))
 		UnregisterSignal(I.loc, COMSIG_LIVING_RESIST)
 
-/datum/component/parry/Initialize(_stamina_constant = 0, _stamina_coefficient = 0, _parry_time_out_time = PARRY_DEFAULT_TIMEOUT, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = 2 SECONDS)
+/datum/component/parry/Initialize(_stamina_constant = 0, _stamina_coefficient = 0, _parry_time_out_time = PARRY_DEFAULT_TIMEOUT, _parryable_attack_types = ALL_ATTACK_TYPES, _parry_cooldown = 2 SECONDS, _no_parry_sound = FALSE)
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
 
 	parry_time_out_time = _parry_time_out_time
 	stamina_constant = _stamina_constant
 	stamina_coefficient = _stamina_coefficient
 	parry_cooldown = _parry_cooldown
+	no_parry_sound = _no_parry_sound
 	if(islist(_parryable_attack_types))
 		parryable_attack_types = _parryable_attack_types
 	else
@@ -61,6 +64,7 @@
 
 /datum/component/parry/proc/attempt_parry(datum/source, mob/living/carbon/human/owner, atom/movable/hitby, damage = 0, attack_type = MELEE_ATTACK)
 	SIGNAL_HANDLER
+	var/was_perfect = FALSE
 	if(!(attack_type in parryable_attack_types))
 		return
 	var/time_since_parry = world.time - time_parried
@@ -80,17 +84,22 @@
 
 	var/stamina_damage = stamina_coefficient * (((time_since_parry / parry_time_out_time) + armour_penetration_percentage / 100) * (damage + armour_penetration_flat)) + stamina_constant
 
-	var/sound_to_play
-	if(attack_type == PROJECTILE_ATTACK)
-		sound_to_play = pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg')
-	else
-		sound_to_play = 'sound/weapons/parry.ogg'
+	if(!no_parry_sound)
+		var/sound_to_play
+		if(attack_type == PROJECTILE_ATTACK)
+			sound_to_play = pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg')
+		else
+			sound_to_play = 'sound/weapons/parry.ogg'
 
-	playsound(owner, sound_to_play, clamp(stamina_damage, 40, 120))
+		playsound(owner, sound_to_play, clamp(stamina_damage, 40, 120))
+	if(time_since_parry <= parry_time_out_time * 0.5) // a perfect parry
+		was_perfect = TRUE
 
 	owner.adjustStaminaLoss(stamina_damage)
 	if(owner.getStaminaLoss() < 100)
-		return COMPONENT_BLOCK_SUCCESSFUL
+		if(!was_perfect)
+			return COMPONENT_BLOCK_SUCCESSFUL
+		return (COMPONENT_BLOCK_SUCCESSFUL | COMPONENT_BLOCK_PERFECT)
 
 
 

code/datums/action.dm

@@ -361,8 +361,8 @@ GLOBAL_LIST_INIT(advance_cures, list(
 		var/datum/disease/advance/D2 = pick(diseases)
 		D2.Mix(D1)
 
-	 // Should be only 1 entry left, but if not let's only return a single entry
-//	to_chat(world, "END MIXING!!!!!")
+	// Should be only 1 entry left, but if not let's only return a single entry
+	// to_chat(world, "END MIXING!!!!!")
 	var/datum/disease/advance/to_return = pick(diseases)
 	to_return.Refresh(1)
 	return to_return

code/datums/armor.dm

@@ -28,11 +28,11 @@
 /datum/news_announcement/revolution_inciting_event/human_experiments
 	round_time = 60*90
 	message = {"Unbelievable reports about human experimentation have reached our ears. According
-			 	to a refugee from one of the Tau Ceti Research Stations, their station, in order
-			 	to increase revenue, has refactored several of their facilities to perform experiments
-			 	on live humans, including virology research, genetic manipulation, and \"feeding them
-			 	to the slimes to see what happens\". Allegedly, these test subjects were neither
-			 	humanified monkeys nor volunteers, but rather unqualified staff that were forced into
+				to a refugee from one of the Tau Ceti Research Stations, their station, in order
+				to increase revenue, has refactored several of their facilities to perform experiments
+				on live humans, including virology research, genetic manipulation, and \"feeding them
+				to the slimes to see what happens\". Allegedly, these test subjects were neither
+				humanified monkeys nor volunteers, but rather unqualified staff that were forced into
 				the experiments, and reported to have died in a \"work accident\" by Nanotrasen Inc."}
 	author = "Unauthorized"
 

code/datums/components/parry.dm

@@ -9,7 +9,7 @@
  * * items are objects. Fruits, tools, circuit boards.
  * * result is type to create as new object
  * * time is optional parameter, you shall use in in your machine,
-     default /datum/recipe/ procs does not rely on this parameter.
+ *   default /datum/recipe/ procs does not rely on this parameter.
  *
  *  Functions you need:
  *  /datum/recipe/proc/make(var/obj/container as obj)

code/datums/diseases/advance/advance.dm

@@ -25,7 +25,7 @@
 			spawn()
 				A.throw_at(get_edge_target_turf(H, pick(GLOB.alldirs)), rand(1, 10), 5)
 			H.visible_message("<span class='danger'>[H]'s [A.name] flies out of their body in a magical explosion!</span>",\
-							  "<span class='danger'>Your [A.name] flies out of your body in a magical explosion!</span>")
+							"<span class='danger'>Your [A.name] flies out of your body in a magical explosion!</span>")
 			H.Weaken(4 SECONDS)
 		else
 			var/obj/effect/decal/cleanable/blood/gibs/G = new/obj/effect/decal/cleanable/blood/gibs(get_turf(H))

code/datums/periodic_news.dm

@@ -537,10 +537,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 
 /datum/uplink_item/dangerous/powerfist
 	name = "Power Fist"
-	desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply.\
-		 Upon hitting a target, the piston-ram will extend foward to make contact for some serious damage. \
-		 Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
-		 deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
+	desc = "The power-fist is a metal gauntlet with a built-in piston-ram powered by an external gas supply. \
+		Upon hitting a target, the piston-ram will extend foward to make contact for some serious damage. \
+		Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \
+		deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks."
 	reference = "PF"
 	item = /obj/item/melee/powerfist
 	cost = 8
@@ -905,17 +905,17 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 
 /datum/uplink_item/stealthy_weapons/cameraflash
 	name = "Camera Flash"
-	desc = "A flash disguised as a camera with a self-charging safety system preventing the flash from burning out.\
-			 Due to its design, this flash cannot be overcharged like regular flashes can.\
-			 Useful for stunning borgs and individuals without eye protection or blinding a crowd for a get away."
+	desc = "A flash disguised as a camera with a self-charging safety system preventing the flash from burning out. \
+			Due to its design, this flash cannot be overcharged like regular flashes can. \
+			Useful for stunning borgs and individuals without eye protection or blinding a crowd for a get away."
 	reference = "CF"
 	item = /obj/item/flash/cameraflash
 	cost = 1
 
 /datum/uplink_item/stealthy_weapons/throwingweapons
 	name = "Box of Throwing Weapons"
 	desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \
-			 throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
+			throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
 	reference = "STK"
 	item = /obj/item/storage/box/syndie_kit/throwing_weapons
 	cost = 3

code/datums/recipe.dm

@@ -162,7 +162,7 @@
 	holder.add_hiddenprint(user)
 
 	switch(action)
-		 // Toggles the cut/mend status.
+		// Toggles the cut/mend status.
 		if("cut")
 			if(!istype(I, /obj/item/wirecutters) && !user.can_admin_interact())
 				to_chat(user, "<span class='error'>You need wirecutters!</span>")
@@ -188,7 +188,7 @@
 
 			return TRUE
 
-		 // Attach a signaler to a wire.
+		// Attach a signaler to a wire.
 		if("attach")
 			if(is_attached(color))
 				var/obj/item/O = detach_assembly(color)

code/datums/spells/rathens.dm

@@ -565,16 +565,16 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 //STATION13
 
 /area/atmos
- 	name = "Atmospherics"
- 	icon_state = "atmos"
+	name = "Atmospherics"
+	icon_state = "atmos"
 
 /area/atmos/control
- 	name = "Atmospherics Control Room"
- 	icon_state = "atmosctrl"
+	name = "Atmospherics Control Room"
+	icon_state = "atmosctrl"
 
 /area/atmos/distribution
- 	name = "Atmospherics Distribution Loop"
- 	icon_state = "atmos"
+	name = "Atmospherics Distribution Loop"
+	icon_state = "atmos"
 
 //Maintenance
 /area/maintenance

code/datums/uplink_item.dm

@@ -1169,7 +1169,7 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
 
 /** Call this when you want to present a renaming prompt to the user.
 
-    It's a simple proc, but handles annoying edge cases such as forgetting to add a "cancel" button,
+	It's a simple proc, but handles annoying edge cases such as forgetting to add a "cancel" button,
 	or being able to rename stuff remotely.
 
 	Arguments:

code/datums/wires/wires.dm

@@ -134,9 +134,9 @@
 	go_out(user, force)
 	for(var/obj/O in src)
 		if(!istype(O,/obj/item/circuitboard/clonescanner) && \
-		   !istype(O,/obj/item/stock_parts) && \
-		   !istype(O,/obj/item/stack/cable_coil) && \
-		   O != beaker)
+			!istype(O,/obj/item/stock_parts) && \
+			!istype(O,/obj/item/stack/cable_coil) && \
+			O != beaker)
 			O.forceMove(get_turf(src))//Ejects items that manage to get in there (exluding the components and beaker)
 	if(!occupant)
 		for(var/mob/M in src)//Failsafe so you can get mobs out
@@ -262,7 +262,7 @@
 		return
 	for(var/obj/thing in contents) // in case there is something in the scanner
 		thing.forceMove(loc)
-	default_deconstruction_crowbar(user, I)	
+	default_deconstruction_crowbar(user, I)
 
 /obj/machinery/dna_scannernew/screwdriver_act(mob/user, obj/item/I)
 	if(occupant)