Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792

code/__DEFINES/_flags/_flags.dm

@@ -137,3 +137,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 
 #define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL | MOBILITY_RESIST)
 #define MOBILITY_FLAGS_ANY_INTERACTION (MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_UI | MOBILITY_STORAGE)
+
+// melee_attack_chain() attackchain_flags
+/// The attack is from a parry counterattack.
+#define ATTACKCHAIN_PARRY_COUNTERATTACK			(1<<0)

code/__DEFINES/_flags/item_flags.dm

@@ -0,0 +1,54 @@
+// Flags for the item_flags var on /obj/item
+
+#define BEING_REMOVED						(1<<0)
+///is this item equipped into an inventory slot or hand of a mob? used for tooltips
+#define IN_INVENTORY						(1<<1)
+///used for tooltips
+#define FORCE_STRING_OVERRIDE				(1<<2)
+///Used by security bots to determine if this item is safe for public use.
+#define NEEDS_PERMIT						(1<<3)
+#define SLOWS_WHILE_IN_HAND					(1<<4)
+///Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
+#define NO_MAT_REDEMPTION					(1<<5)
+///When dropped, it calls qdel on itself
+#define DROPDEL								(1<<6)
+///when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
+#define NOBLUDGEON							(1<<7)
+///for all things that are technically items but used for various different stuff
+#define ABSTRACT							(1<<8)
+///When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define IMMUTABLE_SLOW          			(1<<9)
+///Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
+#define SURGICAL_TOOL						(1<<10)
+///Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
+#define NO_UNIFORM_REQUIRED					(1<<11)
+///Damage when attacking people is not affected by combat mode.
+#define NO_COMBAT_MODE_FORCE_MODIFIER		(1<<12)
+/// This item can be used to parry. Only a basic check used to determine if we should proceed with parry chain at all.
+#define ITEM_CAN_PARRY						(1<<13)
+/// This item can be used in the directional blocking system. Only a basic check used to determine if we should proceed with directional block handling at all.
+#define ITEM_CAN_BLOCK						(1<<14)
+
+// Flags for the clothing_flags var on /obj/item/clothing
+
+#define LAVAPROTECT 			(1<<0)
+#define STOPSPRESSUREDAMAGE		(1<<1)	//SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
+#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	//blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define ALLOWINTERNALS		  	(1<<3)	//mask allows internals
+#define NOSLIP                  (1<<4)	//prevents from slipping on wet floors, in space etc
+#define NOSLIP_ICE				(1<<5)	 //prevents from slipping on frozen floors
+#define THICKMATERIAL			(1<<6)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
+#define VOICEBOX_TOGGLABLE 		(1<<7)	//The voicebox in this clothing can be toggled.
+#define VOICEBOX_DISABLED 		(1<<8)	//The voicebox is currently turned off.
+#define IGNORE_HAT_TOSS			(1<<9)	//Hats with negative effects when worn (i.e the tinfoil hat).
+#define SCAN_REAGENTS			(1<<10)	// Allows helmets and glasses to scan reagents.
+
+// Flags for the organ_flags var on /obj/item/organ
+
+#define ORGAN_SYNTHETIC			(1<<0)	//Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal
+#define ORGAN_FROZEN			(1<<1)	//Frozen organs, don't deteriorate
+#define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
+#define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
+#define ORGAN_VITAL				(1<<4)	//Currently only the brain
+#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
+#define ORGAN_NO_DISMEMBERMENT	(1<<6)	//Immune to disembowelment.

code/__DEFINES/_flags/obj_flags.dm

@@ -0,0 +1,15 @@
+// Flags for the obj_flags var on /obj
+
+#define EMAGGED					(1<<0)
+#define IN_USE					(1<<1)	//If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
+#define CAN_BE_HIT				(1<<2)	//can this be bludgeoned by items?
+#define BEING_SHOCKED			(1<<3)	//Whether this thing is currently (already) being shocked by a tesla
+#define DANGEROUS_POSSESSION	(1<<4)	//Admin possession yes/no
+#define ON_BLUEPRINTS			(1<<5)	//Are we visible on the station blueprints at roundstart?
+#define UNIQUE_RENAME			(1<<6)	//can you customize the description/name of the thing?
+#define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
+#define FROZEN					(1<<8)
+#define SHOVABLE_ONTO			(1<<9)	//called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.
+#define BLOCK_Z_FALL			(1<<10)
+
+// If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support

code/__DEFINES/combat.dm

@@ -29,10 +29,11 @@
 #define EFFECT_DROWSY		"drowsy"
 #define EFFECT_JITTER		"jitter"
 
+// mob/living/var/combat_flags variable.
 /// Default combat flags for those affected by sprinting (combat mode has been made into its own component)
-#define COMBAT_FLAGS_DEFAULT					NONE
+#define COMBAT_FLAGS_DEFAULT				(COMBAT_FLAG_PARRY_CAPABLE | COMBAT_FLAG_BLOCK_CAPABLE)
 /// Default combat flags for everyone else (so literally everyone but humans).
-#define COMBAT_FLAGS_SPRINT_EXEMPT			(COMBAT_FLAG_SPRINT_ACTIVE | COMBAT_FLAG_SPRINT_TOGGLED | COMBAT_FLAG_SPRINT_FORCED)
+#define COMBAT_FLAGS_SPRINT_EXEMPT			(COMBAT_FLAG_SPRINT_ACTIVE | COMBAT_FLAG_SPRINT_TOGGLED | COMBAT_FLAG_SPRINT_FORCED | COMBAT_FLAG_PARRY_CAPABLE | COMBAT_FLAG_BLOCK_CAPABLE)
 
 /// The user wants sprint mode on
 #define COMBAT_FLAG_SPRINT_TOGGLED			(1<<0)
@@ -50,6 +51,16 @@
 #define COMBAT_FLAG_SOFT_STAMCRIT			(1<<6)
 /// Force sprint mode on at all times, overrides everything including sprint disable traits.
 #define COMBAT_FLAG_SPRINT_FORCED			(1<<7)
+/// This mob is capable of using the active parrying system.
+#define COMBAT_FLAG_PARRY_CAPABLE			(1<<8)
+/// This mob is capable of using the active blocking system.
+#define COMBAT_FLAG_BLOCK_CAPABLE			(1<<9)
+/// This mob is capable of unarmed parrying
+#define COMBAT_FLAG_UNARMED_PARRY			(1<<10)
+/// This mob is currently actively blocking
+#define COMBAT_FLAG_ACTIVE_BLOCKING			(1<<11)
+/// This mob is currently starting an active block
+#define COMBAT_FLAG_ACTIVE_BLOCK_STARTING	(1<<12)
 
 // Helpers for getting someone's stamcrit state. Cast to living.
 #define NOT_STAMCRIT 0
@@ -61,10 +72,18 @@
 #define CHECK_STAMCRIT(mob)					((mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)? HARD_STAMCRIT : ((mob.combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)? SOFT_STAMCRIT : NOT_STAMCRIT))
 
 //stamina stuff
-#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
-#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
-#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
-#define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
+///Threshold over which attacks start being hindered.
+#define STAMINA_NEAR_SOFTCRIT				90
+///softcrit for stamina damage. prevents standing up, some actions that cost stamina, etc, but doesn't force a rest or stop movement
+#define STAMINA_SOFTCRIT					100
+///sanity cap to prevent stamina actions (that are still performable) from sending you into crit.
+#define STAMINA_NEAR_CRIT					130
+///crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
+#define STAMINA_CRIT						140
+///same as STAMINA_SOFTCRIT except for the more traditional health calculations
+#define STAMINA_SOFTCRIT_TRADITIONAL		0
+///ditto, but for STAMINA_CRIT
+#define STAMINA_CRIT_TRADITIONAL			-40
 
 #define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob
 
@@ -104,18 +123,6 @@
 #define GRAB_NECK					2
 #define GRAB_KILL					3
 
-/// Attack types for check_block()/run_block(). Flags, combinable.
-/// Attack was melee, whether or not armed.
-#define ATTACK_TYPE_MELEE			(1<<0)
-/// Attack was with a gun or something that should count as a gun (but not if a gun shouldn't count for a gun, crazy right?)
-#define ATTACK_TYPE_PROJECTILE		(1<<1)
-/// Attack was unarmed.. this usually means hand to hand combat.
-#define ATTACK_TYPE_UNARMED			(1<<2)
-/// Attack was a thrown atom hitting the victim.
-#define ATTACK_TYPE_THROWN			(1<<3)
-/// Attack was a bodyslam/leap/tackle. See: Xenomorph leap tackles.
-#define ATTACK_TYPE_TACKLE			(1<<4)
-
 //attack visual effects
 #define ATTACK_EFFECT_PUNCH		"punch"
 #define ATTACK_EFFECT_KICK		"kick"
@@ -182,6 +189,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define EGUN_SELFCHARGE 1
 #define EGUN_SELFCHARGE_BORG 2
 
+///Time to spend without clicking on other things required for your shots to become accurate.
+#define GUN_AIMING_TIME (2 SECONDS)
+
 //Object/Item sharpness
 #define IS_BLUNT			0
 #define IS_SHARP			1
@@ -249,70 +259,24 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define STAM_COST_W_CLASS_MULT		1.25
 #define STAM_COST_THROW_MULT		2
 
+///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted.
+#define STAM_CRIT_ITEM_ATTACK_PENALTY	0.66
+/// changeNext_move penalty multiplier of the above.
+#define STAM_CRIT_ITEM_ATTACK_DELAY		1.75
+/// Damage penalty when fighting prone.
+#define LYING_DAMAGE_PENALTY			0.5
+/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise.
+#define STAM_CRIT_GUN_DELAY			2.75
+
+/**
+  * should the current-attack-damage be lower than the item force multiplied by this value,
+  * a "inefficiently" prefix will be added to the message.
+  */
+#define FEEBLE_ATTACK_MSG_THRESHOLD 0.5
+
 
 //bullet_act() return values
 #define BULLET_ACT_HIT				"HIT"		//It's a successful hit, whatever that means in the context of the thing it's hitting.
 #define BULLET_ACT_BLOCK			"BLOCK"		//It's a blocked hit, whatever that means in the context of the thing it's hitting.
 #define BULLET_ACT_FORCE_PIERCE		"PIERCE"	//It pierces through the object regardless of the bullet being piercing by default.
 #define BULLET_ACT_TURF				"TURF"		//It hit us but it should hit something on the same turf too. Usually used for turfs.
-
-/// Check whether or not we can block, without "triggering" a block. Basically run checks without effects like depleting shields.
-/// Wrapper for do_run_block(). The arguments on that means the same as for this.
-#define mob_check_block(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)\
-	do_run_block(FALSE, object, damage, attack_text, attack_type, armour_penetration, attacker, check_zone(def_zone), return_list)
-
-/// Runs a block "sequence", effectively checking and then doing effects if necessary.
-/// Wrapper for do_run_block(). The arguments on that means the same as for this.
-#define mob_run_block(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)\
-	do_run_block(TRUE, object, damage, attack_text, attack_type, armour_penetration, attacker, check_zone(def_zone), return_list)
-
-/// Bitflags for check_block() and run_block(). Meant to be combined. You can be hit and still reflect, for example, if you do not use BLOCK_SUCCESS.
-/// Attack was not blocked
-#define BLOCK_NONE						NONE
-/// Attack was blocked, do not do damage. THIS FLAG MUST BE THERE FOR DAMAGE/EFFECT PREVENTION!
-#define BLOCK_SUCCESS					(1<<1)
-
-/// The below are for "metadata" on "how" the attack was blocked.
-
-/// Attack was and should be redirected according to list argument REDIRECT_METHOD (NOTE: the SHOULD here is important, as it says "the thing blocking isn't handling the reflecting for you so do it yourself"!)
-#define BLOCK_SHOULD_REDIRECT			(1<<2)
-/// Attack was redirected (whether by us or by SHOULD_REDIRECT flagging for automatic handling)
-#define BLOCK_REDIRECTED				(1<<3)
-/// Attack was blocked by something like a shield.
-#define BLOCK_PHYSICAL_EXTERNAL			(1<<4)
-/// Attack was blocked by something worn on you.
-#define BLOCK_PHYSICAL_INTERNAL			(1<<5)
-/// Attack outright missed because the target dodged. Should usually be combined with redirection passthrough or something (see martial arts)
-#define BLOCK_TARGET_DODGED				(1<<7)
-/// Meta-flag for run_block/do_run_block : By default, BLOCK_SUCCESS tells do_run_block() to assume the attack is completely blocked and not continue the block chain. If this is present, it will continue to check other items in the chain rather than stopping.
-#define BLOCK_CONTINUE_CHAIN			(1<<8)
-
-/// For keys in associative list/block_return as we don't want to saturate our (somewhat) limited flags.
-#define BLOCK_RETURN_REDIRECT_METHOD			"REDIRECT_METHOD"
-	/// Pass through victim
-	#define REDIRECT_METHOD_PASSTHROUGH			"passthrough"
-	/// Deflect at randomish angle
-	#define REDIRECT_METHOD_DEFLECT				"deflect"
-	/// reverse 180 angle, basically (as opposed to "realistic" wall reflections)
-	#define REDIRECT_METHOD_REFLECT				"reflect"
-	/// "do not taser the bad man with the desword" - actually aims at the firer/attacker rather than just reversing
-	#define REDIRECT_METHOD_RETURN_TO_SENDER		"no_you"
-
-/// These keys are generally only applied to the list if real_attack is FALSE. Used incase we want to make "smarter" mob AI in the future or something.
-/// Tells the caller how likely from 0 (none) to 100 (always) we are to reflect energy projectiles
-#define BLOCK_RETURN_REFLECT_PROJECTILE_CHANCE					"reflect_projectile_chance"
-/// Tells the caller how likely we are to block attacks from 0 to 100 in general
-#define BLOCK_RETURN_NORMAL_BLOCK_CHANCE						"normal_block_chance"
-/// Tells the caller about how many hits we can soak on average before our blocking fails.
-#define BLOCK_RETURN_BLOCK_CAPACITY								"block_capacity"
-
-/// Default if the above isn't set in the list.
-#define DEFAULT_REDIRECT_METHOD_PROJECTILE REDIRECT_METHOD_DEFLECT
-
-/// Block priorities
-#define BLOCK_PRIORITY_HELD_ITEM				100
-#define BLOCK_PRIORITY_WEAR_SUIT				75
-#define BLOCK_PRIORITY_CLOTHING					50
-#define BLOCK_PRIORITY_UNIFORM					25
-
-#define BLOCK_PRIORITY_DEFAULT BLOCK_PRIORITY_HELD_ITEM

code/__DEFINES/combat/attack_types.dm

@@ -0,0 +1,32 @@
+// Attack types for check_block()/run_block(). Flags, combinable.
+/// Attack was melee, whether or not armed.
+#define ATTACK_TYPE_MELEE			(1<<0)
+/// Attack was with a gun or something that should count as a gun (but not if a gun shouldn't count for a gun, crazy right?)
+#define ATTACK_TYPE_PROJECTILE		(1<<1)
+/// Attack was unarmed.. this usually means hand to hand combat.
+#define ATTACK_TYPE_UNARMED			(1<<2)
+/// Attack was a thrown atom hitting the victim.
+#define ATTACK_TYPE_THROWN			(1<<3)
+/// Attack was a bodyslam/leap/tackle. See: Xenomorph leap tackles.
+#define ATTACK_TYPE_TACKLE			(1<<4)
+/// Attack was from a parry counterattack. Do not attempt to parry-this!
+#define ATTACK_TYPE_PARRY_COUNTERATTACK			(1<<5)
+
+// Requires for datum definitions to not error with must be a constant statement when used in lists as text associative keys.
+// KEEP IN SYNC WITH ABOVE!
+
+#define TEXT_ATTACK_TYPE_MELEE					"1"
+#define TEXT_ATTACK_TYPE_PROJECTILE				"2"
+#define TEXT_ATTACK_TYPE_UNARMED				"4"
+#define TEXT_ATTACK_TYPE_THROWN					"8"
+#define TEXT_ATTACK_TYPE_TACKLE					"16"
+#define TEXT_ATTACK_TYPE_PARRY_COUNTERATTACK	"32"
+
+GLOBAL_LIST_INIT(attack_type_names, list(
+	TEXT_ATTACK_TYPE_MELEE = "Melee",
+	TEXT_ATTACK_TYPE_PROJECTILE = "Projectile",
+	TEXT_ATTACK_TYPE_UNARMED = "Unarmed",
+	TEXT_ATTACK_TYPE_THROWN = "Thrown",
+	TEXT_ATTACK_TYPE_TACKLE = "Tackle",
+	TEXT_ATTACK_TYPE_PARRY_COUNTERATTACK = "Parry Counterattack"
+))

code/__DEFINES/combat/block.dm

@@ -0,0 +1,80 @@
+/// Check whether or not we can block, without "triggering" a block. Basically run checks without effects like depleting shields.
+/// Wrapper for do_run_block(). The arguments on that means the same as for this.
+#define mob_check_block(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)\
+	do_run_block(FALSE, object, damage, attack_text, attack_type, armour_penetration, attacker, check_zone(def_zone), return_list)
+
+/// Runs a block "sequence", effectively checking and then doing effects if necessary.
+/// Wrapper for do_run_block(). The arguments on that means the same as for this.
+#define mob_run_block(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)\
+	do_run_block(TRUE, object, damage, attack_text, attack_type, armour_penetration, attacker, check_zone(def_zone), return_list)
+
+// Don't ask why there's block_parry.dm and this. This is for the run_block() system, which is the "parent" system of the directional block and parry systems.
+
+/// Bitflags for check_block() and handle_block(). Meant to be combined. You can be hit and still reflect, for example, if you do not use BLOCK_SUCCESS.
+/// Attack was not blocked
+#define BLOCK_NONE						NONE
+/// Attack was blocked, do not do damage. THIS FLAG MUST BE THERE FOR DAMAGE/EFFECT PREVENTION!
+#define BLOCK_SUCCESS					(1<<1)
+
+/// The below are for "metadata" on "how" the attack was blocked.
+
+/// Attack was and should be redirected according to list argument REDIRECT_METHOD (NOTE: the SHOULD here is important, as it says "the thing blocking isn't handling the reflecting for you so do it yourself"!)
+#define BLOCK_SHOULD_REDIRECT			(1<<2)
+/// Attack was redirected (whether by us or by SHOULD_REDIRECT flagging for automatic handling)
+#define BLOCK_REDIRECTED				(1<<3)
+/// Attack was blocked by something like a shield.
+#define BLOCK_PHYSICAL_EXTERNAL			(1<<4)
+/// Attack was blocked by something worn on you.
+#define BLOCK_PHYSICAL_INTERNAL			(1<<5)
+/// Attack outright missed because the target dodged. Should usually be combined with redirection passthrough or something (see martial arts)
+#define BLOCK_TARGET_DODGED				(1<<7)
+/// Meta-flag for run_block/do_run_block : By default, BLOCK_SUCCESS tells do_run_block() to assume the attack is completely blocked and not continue the block chain. If this is present, it will continue to check other items in the chain rather than stopping.
+#define BLOCK_CONTINUE_CHAIN			(1<<8)
+/// Attack should change the amount of damage incurred. This means something calling run_block() has to handle it!
+#define BLOCK_SHOULD_CHANGE_DAMAGE		(1<<9)
+/// Attack should scale by this percent, 0 for no block and 100 for full blocked
+#define BLOCK_SHOULD_PARTIAL_MITIGATE	(1<<10)
+
+/// For keys in associative list/block_return as we don't want to saturate our (somewhat) limited flags.
+#define BLOCK_RETURN_REDIRECT_METHOD			"REDIRECT_METHOD"
+	/// Pass through victim
+	#define REDIRECT_METHOD_PASSTHROUGH			"passthrough"
+	/// Deflect at randomish angle
+	#define REDIRECT_METHOD_DEFLECT				"deflect"
+	/// reverse 180 angle, basically (as opposed to "realistic" wall reflections)
+	#define REDIRECT_METHOD_REFLECT				"reflect"
+	/// "do not taser the bad man with the desword" - actually aims at the firer/attacker rather than just reversing
+	#define REDIRECT_METHOD_RETURN_TO_SENDER		"no_you"
+
+/// These keys are generally only applied to the list if real_attack is FALSE. Used incase we want to make "smarter" mob AI in the future or something.
+/// Tells the caller how likely from 0 (none) to 100 (always) we are to reflect energy projectiles
+#define BLOCK_RETURN_REFLECT_PROJECTILE_CHANCE					"reflect_projectile_chance"
+/// Tells the caller how likely we are to block attacks from 0 to 100 in general
+#define BLOCK_RETURN_NORMAL_BLOCK_CHANCE						"normal_block_chance"
+/// Tells the caller about how many hits we can soak on average before our blocking fails.
+#define BLOCK_RETURN_BLOCK_CAPACITY								"block_capacity"
+/// Tells the caller we got blocked by active directional block.
+#define BLOCK_RETURN_ACTIVE_BLOCK								"active_block"
+/// Tells the caller our damage mitigation for their attack.
+#define BLOCK_RETURN_ACTIVE_BLOCK_DAMAGE_MITIGATED				"damage_mitigated"
+/// For [BLOCK_CHANGE_DAMAGE]. Set damage to this.
+#define BLOCK_RETURN_SET_DAMAGE_TO								"set_damage_to"
+/// For [BLOCK_SHOULD_PARTIAL_MITIGATE]. Percentage mitigation.
+#define BLOCK_RETURN_MITIGATION_PERCENT							"partial_mitigation"
+/// Used internally by run_parry proc, use on an on_active_parry() proc to override parrying efficiency.
+#define BLOCK_RETURN_OVERRIDE_PARRY_EFFICIENCY					"override_parry_efficiency"
+/// Always set to 100 by run_block() if BLOCK_SUCCESS is in return value. Otherwise, defaults to mitigation percent if not set. Used by projectile/proc/on_hit().
+#define BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE				"projectile_block_percentage"
+
+/// Default if the above isn't set in the list.
+#define DEFAULT_REDIRECT_METHOD_PROJECTILE REDIRECT_METHOD_DEFLECT
+
+/// Block priorities. Higher means it's checked sooner.
+// THESE MUST NEVER BE 0! Block code uses ! instead of isnull for the speed boost.
+#define BLOCK_PRIORITY_ACTIVE_BLOCK				200
+#define BLOCK_PRIORITY_HELD_ITEM				100
+#define BLOCK_PRIORITY_CLOTHING					50
+#define BLOCK_PRIORITY_WEAR_SUIT				75
+#define BLOCK_PRIORITY_UNIFORM					25
+
+#define BLOCK_PRIORITY_DEFAULT BLOCK_PRIORITY_HELD_ITEM

code/__DEFINES/combat/block_parry.dm

@@ -0,0 +1,72 @@
+// We can't determine things like NORTHEAST vs NORTH *and* EAST without making our own flags :(
+#define BLOCK_DIR_NORTH			(1<<0)
+#define BLOCK_DIR_NORTHEAST		(1<<1)
+#define BLOCK_DIR_NORTHWEST		(1<<2)
+#define BLOCK_DIR_WEST			(1<<3)
+#define BLOCK_DIR_EAST			(1<<4)
+#define BLOCK_DIR_SOUTH			(1<<5)
+#define BLOCK_DIR_SOUTHEAST		(1<<6)
+#define BLOCK_DIR_SOUTHWEST		(1<<7)
+#define BLOCK_DIR_ONTOP			(1<<8)
+
+GLOBAL_LIST_INIT(dir2blockdir, list(
+	"[NORTH]" = BLOCK_DIR_NORTH,
+	"[NORTHEAST]" = BLOCK_DIR_NORTHEAST,
+	"[NORTHWEST]" = BLOCK_DIR_NORTHWEST,
+	"[WEST]" = BLOCK_DIR_WEST,
+	"[EAST]" = BLOCK_DIR_EAST,
+	"[SOUTH]" = BLOCK_DIR_SOUTH,
+	"[SOUTHEAST]" = BLOCK_DIR_SOUTHEAST,
+	"[SOUTHWEST]" = BLOCK_DIR_SOUTHWEST,
+	"[NONE]" = BLOCK_DIR_ONTOP
+	))
+
+#define DIR2BLOCKDIR(d)			(GLOB.dir2blockdir["[d]"])
+
+GLOBAL_LIST_INIT(block_direction_names, list(
+	"[BLOCK_DIR_NORTH]" = "Front",
+	"[BLOCK_DIR_NORTHEAST]" = "Front Right",
+	"[BLOCK_DIR_NORTHWEST]" = "Front Left",
+	"[BLOCK_DIR_WEST]" = "Left",
+	"[BLOCK_DIR_EAST]" = "Right",
+	"[BLOCK_DIR_SOUTH]" = "Behind",
+	"[BLOCK_DIR_SOUTHEAST]" = "Behind Right",
+	"[BLOCK_DIR_SOUTHWEST]" = "Behind Left",
+	"[BLOCK_DIR_ONTOP]" = "Ontop"
+))
+
+/// If this is the value of active_block_starting it signals we want to interrupt the start
+#define ACTIVE_BLOCK_STARTING_INTERRUPT "INTERRUPT"
+
+/// ""types"" of parry "items"
+#define UNARMED_PARRY		"unarmed"
+#define MARTIAL_PARRY		"martial"
+#define ITEM_PARRY			"item"
+
+/// Parry phase we're in
+#define NOT_PARRYING			0
+#define PARRY_WINDUP			1
+#define PARRY_ACTIVE			2
+#define PARRY_SPINDOWN			3
+
+// /datum/block_parry_data/var/parry_flags
+/// Default handling for audio/visual feedback
+#define PARRY_DEFAULT_HANDLE_FEEDBACK		(1<<0)
+/// Lock sprinting while parrying
+#define PARRY_LOCK_SPRINTING				(1<<1)
+/// Lock attacking while parrying
+#define PARRY_LOCK_ATTACKING				(1<<2)
+
+/// Parry effects.
+/// Automatically melee attacks back normally, LMB equivalent action of an harm intent attack. List association should be defaulting to 1, being the attack damage multiplier for said counterattack
+#define PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN		"melee_counterattack_chain"
+/// List association should be TRUE.
+#define PARRY_DISARM_ATTACKER				"disarm_attacker"
+/// List association should be duration or null for just plain knockdown.
+#define PARRY_KNOCKDOWN_ATTACKER			"knockdown_attacker"
+/// List association should be duration.
+#define PARRY_STAGGER_ATTACKER				"stagger_attacker"
+/// List association should be amount of time to daze attacker.
+#define PARRY_DAZE_ATTACKER					"daze_attacker"
+/// Set to TRUE in list association to ignore adjacency checks
+#define PARRY_COUNTERATTACK_IGNORE_ADJACENCY			"ignore_adjacency"

code/__DEFINES/construction.dm

@@ -67,7 +67,9 @@
 //tablecrafting defines
 #define CAT_NONE	""
 #define CAT_WEAPONRY	"Weaponry"
-#define CAT_WEAPON	"Weapons"
+#define CAT_WEAPON	"Ranged Weapons"
+#define CAT_MELEE	"Melee Weapons"
+#define CAT_OTHER	"Misc"
 #define CAT_AMMO	"Ammunition"
 #define CAT_PARTS	"Weapon Parts"
 #define CAT_ROBOT	"Robots"

code/__DEFINES/economy.dm

@@ -33,3 +33,19 @@
 #define ID_NO_BANK_ACCOUNT		0
 #define ID_FREE_BANK_ACCOUNT	1
 #define ID_LOCKED_BANK_ACCOUNT	2
+
+//Some price defines to help standarize the intended vending value of items. Do not bother adding too many examples.
+#define PRICE_FREE				0 // Sustainance/soviet vendor stuff.
+#define PRICE_CHEAP_AS_FREE		10 // Cheap lighters, syringes, soft drinks etc.
+#define PRICE_REALLY_CHEAP		20 // Snacks, hot drinks, tools.
+#define PRICE_PRETTY_CHEAP		30 // Some snacks, beer.
+#define PRICE_CHEAP				40 // Clothings. some electronics
+#define PRICE_ALMOST_CHEAP		60 // Fancy clothing, cig packs, booze-o-mat, seeds, medical.
+#define PRICE_BELOW_NORMAL		80 // Clothesmate and kinkmate premium stuff.
+#define PRICE_NORMAL			100 // Kitchen knife, other stuff.
+#define PRICE_ABOVE_NORMAL		150 // Liberation (capitalism ahoy) and donksoft vendors.
+#define PRICE_ALMOST_EXPENSIVE	200 // Butcher knife, cartridges, some premium stuff.
+#define PRICE_EXPENSIVE			325 // Premium stuff.
+#define PRICE_ABOVE_EXPENSIVE	500 // RCD, Crew pinpointer/monitor, galoshes
+#define PRICE_REALLY_EXPENSIVE	700 // More premium stuff.
+#define PRICE_ALMOST_ONE_GRAND	900 // $$$ Insulated gloves, backpack water-tank spray $$$

code/__DEFINES/flags/do_after.dm

@@ -0,0 +1,32 @@
+/// Requires absolute stillness from the user
+#define DO_AFTER_DISALLOW_MOVING_ABSOLUTE_USER		(1<<0)
+/// Requires absolute stillness from the target
+#define DO_AFTER_DISALLOW_MOVING_ABSOLUTE_TARGET	(1<<1)
+/// Requires that the user is on a turf.
+#define DO_AFTER_REQUIRES_USER_ON_TURF				(1<<2)
+/// Requires relative stillness to our target via dx and dy coordinate difference but only if both are spacedrifting. Specify DO_AFTER_ALLOW_NONSPACEDRIFT_RELATIVITY to say otherwise.
+#define DO_AFTER_DISALLOW_MOVING_RELATIVE			(1<<3)
+/// Breaks if active hand item changes. Requires a tool be specified, otherwise defaults to active item
+#define DO_AFTER_DISALLOW_ACTIVE_ITEM_CHANGE		(1<<4)
+/// Breaks if the user has no free hands. If a tool is specified, allows that as well.
+#define DO_AFTER_REQUIRE_FREE_HAND_OR_TOOL			(1<<5)
+/// Do not display progressbar.
+#define DO_AFTER_NO_PROGRESSBAR						(1<<6)
+/// Do not check do_after_coefficient()
+#define DO_AFTER_NO_COEFFICIENT						(1<<7)
+/// For relative stillness, allow non spacedrift relative movement
+#define DO_AFTER_ALLOW_NONSPACEDRIFT_RELATIVITY		(1<<8)
+
+/// Ignores checks.
+#define DO_AFTER_PROCEED		"PROCEED"
+/// Uses all other checks
+#define DO_AFTER_CONTINUE		"CONTINUE"
+/// Breaks
+#define DO_AFTER_STOP			"STOP"
+
+/// Stage - initiating a do_after
+#define DO_AFTER_STARTING 1
+/// Stage - main loop of a do_after
+#define DO_AFTER_PROGRESSING 2
+/// Stage - Last check of a do_after
+#define DO_AFTER_FINISHING 3

code/__DEFINES/is_helpers.dm

@@ -1,3 +1,6 @@
+/// Checks if something is a BYOND object datatype rather than a primitive, or whatever's closest to one.
+#define is_object_datatype(object)		(object && !ispath(object) && !istext(object) && !isnum(object))
+
 // simple is_type and similar inline helpers
 
 #define in_range(source, user) (get_dist(source, user) <= 1 && (get_step(source, 0)?:z) == (get_step(user, 0)?:z))

code/__DEFINES/lighting.dm

@@ -88,3 +88,28 @@
 #define EMISSIVE_BLOCK_GENERIC 1
 /// Uses a dedicated render_target object to copy the entire appearance in real time to the blocking layer. For things that can change in appearance a lot from the base state, like humans.
 #define EMISSIVE_BLOCK_UNIQUE 2
+
+
+/// Returns the red part of a #RRGGBB hex sequence as number
+#define GETREDPART(hexa) hex2num(copytext(hexa, 2, 4))
+
+/// Returns the green part of a #RRGGBB hex sequence as number
+#define GETGREENPART(hexa) hex2num(copytext(hexa, 4, 6))
+
+/// Returns the blue part of a #RRGGBB hex sequence as number
+#define GETBLUEPART(hexa) hex2num(copytext(hexa, 6, 8))
+
+/// Parse the hexadecimal color into lumcounts of each perspective.
+#define PARSE_LIGHT_COLOR(source) \
+do { \
+	if (source.light_color) { \
+		var/__light_color = source.light_color; \
+		source.lum_r = GETREDPART(__light_color) / 255; \
+		source.lum_g = GETGREENPART(__light_color) / 255; \
+		source.lum_b = GETBLUEPART(__light_color) / 255; \
+	} else { \
+		source.lum_r = 1; \
+		source.lum_g = 1; \
+		source.lum_b = 1; \
+	}; \
+} while (FALSE)

code/__DEFINES/movespeed_modification.dm

@@ -8,5 +8,68 @@
 //ids
 #define MOVESPEED_ID_SANITY						"mood_sanity"
 
-#define MOVESPEED_ID_MOB_GRAB_STATE				"mob_grab_state"
+#define MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED			"MOB_WALK_RUN"
+#define MOVESPEED_ID_MOB_GRAB_STATE						"MOB_GRAB_STATE"
+#define MOVESPEED_ID_MOB_EQUIPMENT						"MOB_EQUIPMENT"
+#define MOVESPEED_ID_MOB_GRAVITY						"MOB_GRAVITY"
+#define MOVESPEED_ID_CONFIG_SPEEDMOD					"MOB_CONFIG_MODIFIER"
+
+#define MOVESPEED_ID_SLIME_REAGENTMOD					"SLIME_REAGENT_MODIFIER"
+#define MOVESPEED_ID_SLIME_HEALTHMOD					"SLIME_HEALTH_MODIFIER"
+#define MOVESPEED_ID_SLIME_TEMPMOD						"SLIME_TEMPERATURE_MODIFIER"
+
+#define MOVESPEED_ID_SLIME_STATUS						"SLIME_STATUS"
+
+#define MOVESPEED_ID_TARANTULA_WEB						"TARANTULA_WEB"
+
+#define MOVESPEED_ID_LIVING_TURF_SPEEDMOD				"LIVING_TURF_SPEEDMOD"
+#define MOVESPEED_ID_LIVING_LIMBLESS					"LIVING_LIMBLESS"
+
+#define MOVESPEED_ID_CARBON_SOFTCRIT					"CARBON_SOFTCRIT"
+#define MOVESPEED_ID_CARBON_OLDSPEED					"CARBON_DEPRECATED_SPEED"
+
+#define MOVESPEED_ID_DNA_VAULT							"DNA_VAULT"
+
+#define MOVESPEED_ID_YELLOW_ORB							"YELLOW_ORB"
+
+#define MOVESPEED_ID_TARFOOT							"TARFOOT"
+
+#define MOVESPEED_ID_SEPIA								"SEPIA"
+
+#define MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD			"MONKEY_REAGENT_SPEEDMOD"
+#define MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD		"MONKEY_TEMPERATURE_SPEEDMOD"
+#define MOVESPEED_ID_MONKEY_HEALTH_SPEEDMOD				"MONKEY_HEALTH_SPEEDMOD"
+
+#define MOVESPEED_ID_CHANGELING_MUSCLES					"CHANGELING_MUSCLES"
+
+#define MOVESPEED_ID_SIMPLEMOB_VARSPEED					"SIMPLEMOB_VARSPEED_MODIFIER"
+#define MOVESPEED_ID_ADMIN_VAREDIT						"ADMIN_VAREDIT_MODIFIER"
+
+#define MOVESPEED_ID_PAI_SPACEWALK_SPEEDMOD				"PAI_SPACEWALK_MODIFIER"
+
+#define MOVESPEED_ID_SPECIES							"SPECIES_SPEED_MOD"
+
+#define MOVESPEED_ID_PRONE_DRAGGING                     "PRONE_DRAG"
+#define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
+#define MOVESPEED_ID_SHRINK_RAY							"SHRUNKEN_SPEED_MODIFIER"
+
+#define MOVESPEED_ID_SLAUGHTER                          "SLAUGHTER"
+
+#define MOVESPEED_ID_CYBER_THRUSTER						"CYBER_IMPLANT_THRUSTER"
+#define MOVESPEED_ID_JETPACK							"JETPACK"
+
+#define MOVESPEED_ID_MKULTRA							"MKULTRA"
+
+#define MOVESPEED_ID_TASED_STATUS						"TASED"
+#define MOVESPEED_ID_ELECTROSTAFF						"ELECTROSTAFF"
+
+#define MOVESPEED_ID_SHOVE 								"SHOVE"
+#define MOVESPEED_ID_FAT                                "FAT"
+#define MOVESPEED_ID_COLD                               "COLD"
+#define MOVESPEED_ID_HUNGRY                             "HUNGRY"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN                    "DAMAGE"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING				"FLYING"
+
+#define MOVESPEED_ID_ACTIVE_BLOCK						"ACTIVE_BLOCK"
+
 #define MOVESPEED_ID_MOB_WALK_RUN				"mob_walk_run"

code/__DEFINES/obj_flags.dm

@@ -1,56 +0,0 @@
-// Flags for the obj_flags var on /obj
-
-
-#define EMAGGED					(1<<0)
-#define IN_USE					(1<<1)	//If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
-#define CAN_BE_HIT				(1<<2)	//can this be bludgeoned by items?
-#define BEING_SHOCKED			(1<<3)	//Whether this thing is currently (already) being shocked by a tesla
-#define DANGEROUS_POSSESSION	(1<<4)	//Admin possession yes/no
-#define ON_BLUEPRINTS			(1<<5)	//Are we visible on the station blueprints at roundstart?
-#define UNIQUE_RENAME			(1<<6)	//can you customize the description/name of the thing?
-#define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
-#define FROZEN					(1<<8)
-#define SHOVABLE_ONTO			(1<<9)	//called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.
-#define BLOCK_Z_FALL			(1<<10)
-
-// If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support
-
-// Flags for the item_flags var on /obj/item
-
-#define BEING_REMOVED						(1<<0)
-#define IN_INVENTORY						(1<<1)	//is this item equipped into an inventory slot or hand of a mob? used for tooltips
-#define FORCE_STRING_OVERRIDE				(1<<2)	//used for tooltips
-#define NEEDS_PERMIT						(1<<3)	//Used by security bots to determine if this item is safe for public use.
-#define SLOWS_WHILE_IN_HAND					(1<<4)
-#define NO_MAT_REDEMPTION					(1<<5)	//Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
-#define DROPDEL								(1<<6)	//When dropped, it calls qdel on itself
-#define NOBLUDGEON							(1<<7)	//when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define ABSTRACT							(1<<8) 	//for all things that are technically items but used for various different stuff
-#define IMMUTABLE_SLOW          			(1<<9)	//When players should not be able to change the slowdown of the item (Speed potions, ect)
-#define SURGICAL_TOOL						(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
-#define NO_UNIFORM_REQUIRED					(1<<11) //Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
-#define NO_ATTACK_CHAIN_SOFT_STAMCRIT		(1<<12)		//Entirely blocks melee_attack_chain() if user is soft stamcritted. Uses getStaminaLoss() to check at this point in time. THIS DOES NOT BLOCK RANGED AFTERATTACK()S, ONLY MELEE RANGE AFTERATTACK()S.
-
-// Flags for the clothing_flags var on /obj/item/clothing
-
-#define LAVAPROTECT 			(1<<0)
-#define STOPSPRESSUREDAMAGE		(1<<1)	//SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
-#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	//blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
-#define ALLOWINTERNALS		  	(1<<3)	//mask allows internals
-#define NOSLIP                  (1<<4)	//prevents from slipping on wet floors, in space etc
-#define NOSLIP_ICE				(1<<5)	 //prevents from slipping on frozen floors
-#define THICKMATERIAL			(1<<6)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
-#define VOICEBOX_TOGGLABLE 		(1<<7)	//The voicebox in this clothing can be toggled.
-#define VOICEBOX_DISABLED 		(1<<8)	//The voicebox is currently turned off.
-#define IGNORE_HAT_TOSS			(1<<9)	//Hats with negative effects when worn (i.e the tinfoil hat).
-#define SCAN_REAGENTS			(1<<10)	// Allows helmets and glasses to scan reagents.
-
-// Flags for the organ_flags var on /obj/item/organ
-
-#define ORGAN_SYNTHETIC			(1<<0)	//Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal
-#define ORGAN_FROZEN			(1<<1)	//Frozen organs, don't deteriorate
-#define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
-#define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
-#define ORGAN_VITAL				(1<<4)	//Currently only the brain
-#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
-#define ORGAN_NO_DISMEMBERMENT	(1<<6)	//Immune to disembowelment.

code/__DEFINES/storage/volumetrics.dm

@@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(default_weight_class_to_volume, list(
 // Let's keep all of this in one place. given what we put above anyways..
 
 // volume amount for items
-#define ITEM_VOLUME_DISK				DEFAULT_VOLUME_TINY
+#define ITEM_VOLUME_DISK					1
 
 // #define SAMPLE_VOLUME_AMOUNT 2
 

code/__DEFINES/time.dm

@@ -18,6 +18,7 @@
 #define VALENTINES				"Valentine's Day"
 #define APRIL_FOOLS				"April Fool's Day"
 #define EASTER					"Easter"
+#define PRIDE_MONTH				"Pride Month"
 #define HALLOWEEN				"Halloween"
 #define CHRISTMAS				"Christmas"
 #define FESTIVE_SEASON			"Festive Season"
@@ -38,6 +39,8 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using
 #define SATURDAY	"Sat"
 #define SUNDAY		"Sun"
 
+#define WEEKDAY2NUM(D) (D == SUNDAY ? 1 : D == MONDAY ? 2 : D == TUESDAY ? 3 : D == WEDNESDAY ? 4 : D == THURSDAY ? 5 : D == FRIDAY ? 6 : 7) //this looks ugly, but switch statements can't be used as vars, so *shrug
+
 #define SECONDS *10
 
 #define MINUTES SECONDS*60

code/__DEFINES/traits.dm

@@ -295,3 +295,7 @@
 #define CLOWNOP_TRAIT "clown-op"
 #define MEGAFAUNA_TRAIT "megafauna"
 #define DEATHSQUAD_TRAIT "deathsquad"
+/// This trait is added by the active directional block system.
+#define ACTIVE_BLOCK_TRAIT				"active_block"
+/// This trait is added by the parry system.
+#define ACTIVE_PARRY_TRAIT				"active_parry"

code/__HELPERS/areas.dm

@@ -170,6 +170,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng
 		newA.setup(str)
 		newA.set_dynamic_lighting()
 		newA.has_gravity = oldA.has_gravity
+		newA.noteleport = oldA.noteleport
 	else
 		newA = area_choice
 

code/__HELPERS/cmp.dm

@@ -104,7 +104,7 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 	var/a_sign = num2sign(initial(A.value) * -1)
 	var/b_sign = num2sign(initial(B.value) * -1)
 
-	// Neutral traits go last.
+	// Neutral traits go last
 	if(a_sign == 0)
 		a_sign = 2
 	if(b_sign == 0)

code/__HELPERS/do_after.dm

@@ -0,0 +1,323 @@
+/**
+  * Higher overhead "advanced" version of do_after.
+  * @params
+  * - atom/user is the atom doing the action or the "physical" user
+  * - delay is time in deciseconds
+  * - atom/target is the atom the action is being done to, defaults to user
+  * - do_after_flags see __DEFINES/flags/do_after.dm for details.
+  * - datum/callback/extra_checks - Every time this ticks, extra_checks() is invoked with (user, delay, target, time_left, do_after_flags, required_mobility_flags, required_combat_flags, mob_redirect, stage, initially_held_item, tool).
+  * 	Stage can be DO_AFTER_STARTING, DO_AFTER_PROGRESSING, DO_AFTER_FINISHING
+  * 	If it returns DO_AFTER_STOP, this breaks.
+  * 	If it returns nothing, all other checks are done.
+  * 	If it returns DO_AFTER_PROCEED, all other checks are ignored.
+  * - required_mobility_flags is checked with CHECK_ALL_MOBILITY. Will immediately fail if the user isn't a mob.
+  * - requried_combat_flags is checked with CHECK_MULTIPLE_BITFIELDS. Will immediately fail if the user isn't a mob.
+  * - mob/living/mob_redirect - advanced option: If this is specified, movement and mobility/combat flag checks will use this instead of user. Progressbars will also go to this.
+  * - obj/item/tool - The tool we're using. See do_after flags for details.
+  */
+#define INVOKE_CALLBACK cb_return = extra_checks?.Invoke(user, delay, target, world.time - starttime, do_after_flags, required_mobility_flags, required_combat_flags, mob_redirect, stage, initially_held_item, tool)
+#define CHECK_FLAG_FAILURE ((required_mobility_flags || required_combat_flags) && (!living_user || (required_mobility_flags && !CHECK_ALL_MOBILITY(living_user, required_mobility_flags)) || (required_combat_flags && !CHECK_MULTIPLE_BITFIELDS(living_user.combat_flags, required_combat_flags))))
+#define TIMELEFT (world.time - starttime)
+/proc/do_after_advanced(atom/user, delay, atom/target, do_after_flags, datum/callback/extra_checks, required_mobility_flags, required_combat_flags, mob/living/mob_redirect, obj/item/tool)
+	// CHECK AND SET VARIABLES
+	if(!user)
+		return FALSE
+	if(!target)
+		target = user
+	if((user.loc == null) || (target.loc == null))
+		return FALSE
+	var/mob/living/living_user = mob_redirect
+	if(!living_user && isliving(user))
+		living_user = user
+	var/stage = DO_AFTER_STARTING
+	var/startlocuser = user.loc
+	var/startloctarget = target.loc
+	var/turf/userturf = get_turf(user)
+	var/turf/targetturf = get_turf(target)
+	if(!userturf || !targetturf)
+		return FALSE
+	if((do_after_flags & DO_AFTER_REQUIRES_USER_ON_TURF) && !isturf(user.loc))
+		return FALSE
+	var/starttime = world.time
+	var/endtime = world.time + delay
+	var/obj/item/initially_held_item = mob_redirect?.get_active_held_item()
+	if(!(do_after_flags & DO_AFTER_NO_COEFFICIENT) && living_user)
+		delay *= living_user.do_after_coefficent()
+	var/atom/movable/AM_user = ismovable(user) && user
+	var/drifting = AM_user?.Process_Spacemove(NONE) && AM_user.inertia_dir
+	var/initial_dx = targetturf.x - userturf.x
+	var/initial_dy = targetturf.y - userturf.y
+	var/dx = initial_dx
+	var/dy = initial_dy
+	// DO OUR STARTING CHECKS
+	var/cb_return
+	INVOKE_CALLBACK
+	if(cb_return == DO_AFTER_STOP)
+		return FALSE
+	else if(cb_return != DO_AFTER_PROCEED)
+		if(CHECK_FLAG_FAILURE)
+			return FALSE
+	// SETUP LOOP
+	var/datum/progressbar/progbar
+	if(living_user)
+		if(!(do_after_flags & DO_AFTER_NO_PROGRESSBAR))
+			progbar = new(living_user, delay, target)
+	// MAIN LOOP
+	. = TRUE
+	if(!delay)
+		return
+	var/obj/item/held
+	var/locchanged
+	var/ctu
+	var/ctt
+	while(world.time < endtime)
+		stoplag(1)
+		progbar?.update(TIMELEFT)
+		if(QDELETED(user) || QDELETED(target) || (user.loc == null) || (target.loc == null))
+			. = FALSE
+			break
+		INVOKE_CALLBACK
+		if(cb_return == DO_AFTER_STOP)
+			. = FALSE
+			break
+		else if(cb_return == DO_AFTER_PROCEED)
+			continue
+		// otherwise, go through our normal checks.
+		if(((do_after_flags & DO_AFTER_DISALLOW_MOVING_ABSOLUTE_USER) && (user.loc != startlocuser)) || ((do_after_flags & DO_AFTER_DISALLOW_MOVING_ABSOLUTE_TARGET) && (target.loc != startloctarget)))
+			. = FALSE
+			break
+		else if(do_after_flags & DO_AFTER_DISALLOW_MOVING_RELATIVE)
+			ctu = get_turf(user)
+			ctt = get_turf(target)
+			locchanged = (userturf != ctu) || (targetturf != ctt)
+			userturf = ctu
+			targetturf = ctt
+			dx = targetturf.x - userturf.x
+			dy = targetturf.y - userturf.y
+			if((dx != initial_dx) || (dy != initial_dy))
+				. = FALSE
+				break
+			if(locchanged && !drifting && !(do_after_flags & DO_AFTER_ALLOW_NONSPACEDRIFT_RELATIVITY))
+				. = FALSE
+				break
+		if(!AM_user.inertia_dir)
+			drifting = FALSE
+		if((do_after_flags & DO_AFTER_REQUIRES_USER_ON_TURF) && !isturf(user.loc))
+			return FALSE
+		if(CHECK_FLAG_FAILURE)
+			. = FALSE
+			break
+		held = living_user?.get_active_held_item()
+		if((do_after_flags & DO_AFTER_DISALLOW_ACTIVE_ITEM_CHANGE) && (held != (tool || initially_held_item)))
+			. = FALSE
+			break
+		if((do_after_flags & DO_AFTER_REQUIRE_FREE_HAND_OR_TOOL) && (!living_user?.is_holding(tool) && !length(living_user?.get_empty_held_indexes())))
+			. = FALSE
+			break
+
+	// CLEANUP
+	qdel(progbar)
+	// If we failed, just return.
+	if(!.)
+		return FALSE
+	// DO FINISHING CHECKS
+	if(QDELETED(user) || QDELETED(target))
+		return FALSE
+	INVOKE_CALLBACK
+	if(cb_return == DO_AFTER_STOP)
+		return FALSE
+	else if(cb_return == DO_AFTER_PROCEED)
+		return TRUE
+	if(CHECK_FLAG_FAILURE)
+		return FALSE
+	if(((do_after_flags & DO_AFTER_DISALLOW_MOVING_ABSOLUTE_USER) && (user.loc != startlocuser)) || ((do_after_flags & DO_AFTER_DISALLOW_MOVING_ABSOLUTE_TARGET) && (target.loc != startloctarget)))
+		return FALSE
+	else if(do_after_flags & DO_AFTER_DISALLOW_MOVING_RELATIVE)
+		ctu = get_turf(user)
+		ctt = get_turf(target)
+		locchanged = (userturf != ctu) || (targetturf != ctt)
+		userturf = ctu
+		targetturf = ctt
+		dx = targetturf.x - userturf.x
+		dy = targetturf.y - userturf.y
+		if((dx != initial_dx) || (dy != initial_dy))
+			return FALSE
+		if(locchanged && !drifting && !(do_after_flags & DO_AFTER_ALLOW_NONSPACEDRIFT_RELATIVITY))
+			return FALSE
+	if((do_after_flags & DO_AFTER_REQUIRES_USER_ON_TURF) && !isturf(user.loc))
+		return FALSE
+	held = living_user?.get_active_held_item()
+	if((do_after_flags & DO_AFTER_DISALLOW_ACTIVE_ITEM_CHANGE) && (held != (tool || initially_held_item)))
+		return FALSE
+	if((do_after_flags & DO_AFTER_REQUIRE_FREE_HAND_OR_TOOL) && (!living_user?.is_holding(tool) && !length(living_user?.get_empty_held_indexes())))
+		return FALSE
+
+#undef INVOKE_CALLBACK
+#undef CHECK_FLAG_FAILURE
+
+/proc/do_mob(mob/user , mob/target, time = 30, uninterruptible = 0, progress = 1, datum/callback/extra_checks = null, ignorehelditem = FALSE, resume_time = 0 SECONDS)
+	if(!user || !target)
+		return 0
+	var/user_loc = user.loc
+
+	var/drifting = 0
+	if(!user.Process_Spacemove(0) && user.inertia_dir)
+		drifting = 1
+
+	var/target_loc = target.loc
+
+	var/holding = user.get_active_held_item()
+	var/datum/progressbar/progbar
+	if (progress)
+		progbar = new(user, time, target)
+
+	var/endtime = world.time+time
+	var/starttime = world.time
+	. = 1
+	while (world.time + resume_time < endtime)
+		stoplag(1)
+		if (progress)
+			progbar.update(world.time - starttime + resume_time)
+		if(QDELETED(user) || QDELETED(target))
+			. = 0
+			break
+		if(uninterruptible)
+			continue
+
+		if(drifting && !user.inertia_dir)
+			drifting = 0
+			user_loc = user.loc
+
+		if((!drifting && user.loc != user_loc) || target.loc != target_loc || (!ignorehelditem && user.get_active_held_item() != holding) || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
+			. = 0
+			break
+	if (progress)
+		qdel(progbar)
+
+
+//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
+/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
+	if(check_clicks && next_move > world.time)
+		return FALSE
+	return TRUE
+
+//pass a list in the format list("health" = mob's health var) to check health during this
+/mob/living/break_do_after_checks(list/checked_health, check_clicks)
+	if(islist(checked_health))
+		if(health < checked_health["health"])
+			return FALSE
+		checked_health["health"] = health
+	return ..()
+
+/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null, required_mobility_flags = (MOBILITY_USE|MOBILITY_MOVE), resume_time = 0 SECONDS)
+	if(!user)
+		return 0
+	var/atom/Tloc = null
+	if(target && !isturf(target))
+		Tloc = target.loc
+
+	var/atom/Uloc = user.loc
+
+	var/drifting = 0
+	if(!user.Process_Spacemove(0) && user.inertia_dir)
+		drifting = 1
+
+	var/holding = user.get_active_held_item()
+
+	var/holdingnull = 1 //User's hand started out empty, check for an empty hand
+	if(holding)
+		holdingnull = 0 //Users hand started holding something, check to see if it's still holding that
+
+	delay *= user.do_after_coefficent()
+
+	var/datum/progressbar/progbar
+	if (progress)
+		progbar = new(user, delay, target)
+
+	var/endtime = world.time + delay
+	var/starttime = world.time
+	. = 1
+	var/mob/living/L = isliving(user) && user			//evals to last thing eval'd
+	while (world.time + resume_time < endtime)
+		stoplag(1)
+		if (progress)
+			progbar.update(world.time - starttime + resume_time)
+
+		if(drifting && !user.inertia_dir)
+			drifting = 0
+			Uloc = user.loc
+
+		if(L && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
+			. = 0
+			break
+
+		if(QDELETED(user) || user.stat || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
+			. = 0
+			break
+
+		if(!QDELETED(Tloc) && (QDELETED(target) || Tloc != target.loc))
+			if((Uloc != Tloc || Tloc != user) && !drifting)
+				. = 0
+				break
+
+		if(needhand)
+			//This might seem like an odd check, but you can still need a hand even when it's empty
+			//i.e the hand is used to pull some item/tool out of the construction
+			if(!holdingnull)
+				if(!holding)
+					. = 0
+					break
+			if(user.get_active_held_item() != holding)
+				. = 0
+				break
+	if (progress)
+		qdel(progbar)
+
+/mob/proc/do_after_coefficent() // This gets added to the delay on a do_after, default 1
+	. = 1
+	return
+
+/proc/do_after_mob(mob/user, var/list/targets, time = 30, uninterruptible = 0, progress = 1, datum/callback/extra_checks)
+	if(!user || !targets)
+		return 0
+	if(!islist(targets))
+		targets = list(targets)
+	var/user_loc = user.loc
+
+	var/drifting = 0
+	if(!user.Process_Spacemove(0) && user.inertia_dir)
+		drifting = 1
+
+	var/list/originalloc = list()
+	for(var/atom/target in targets)
+		originalloc[target] = target.loc
+
+	var/holding = user.get_active_held_item()
+	var/datum/progressbar/progbar
+	if(progress)
+		progbar = new(user, time, targets[1])
+
+	var/endtime = world.time + time
+	var/starttime = world.time
+	. = 1
+	mainloop:
+		while(world.time < endtime)
+			stoplag(1)
+			if(progress)
+				progbar.update(world.time - starttime)
+			if(QDELETED(user) || !targets)
+				. = 0
+				break
+			if(uninterruptible)
+				continue
+
+			if(drifting && !user.inertia_dir)
+				drifting = 0
+				user_loc = user.loc
+
+			for(var/atom/target in targets)
+				if((!drifting && user_loc != user.loc) || QDELETED(target) || originalloc[target] != target.loc || user.get_active_held_item() != holding || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
+					. = 0
+					break mainloop
+	if(progbar)
+		qdel(progbar)

code/__HELPERS/game.dm

@@ -544,22 +544,6 @@
 	var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
 	announcer.announce("ARRIVAL", character.real_name, rank, list()) //make the list empty to make it announce it in common
 
-/proc/GetHexColors(const/hexa)
-	return list(
-			GetRedPart(hexa)/ 255,
-			GetGreenPart(hexa)/ 255,
-			GetBluePart(hexa)/ 255
-		)
-
-/proc/GetRedPart(const/hexa)
-	return hex2num(copytext(hexa, 2, 4))
-
-/proc/GetGreenPart(const/hexa)
-	return hex2num(copytext(hexa, 4, 6))
-
-/proc/GetBluePart(const/hexa)
-	return hex2num(copytext(hexa, 6, 8))
-
 /proc/lavaland_equipment_pressure_check(turf/T)
 	. = FALSE
 	if(!istype(T))

code/__HELPERS/mobs.dm

@@ -216,6 +216,7 @@
 		"ipc_screen"		= snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
 		"ipc_antenna"		= "None",
 		"flavor_text"		= "",
+		"silicon_flavor_text"		= "",
 		"meat_type"			= "Mammalian",
 		"body_model"		= body_model,
 		"body_size"			= RESIZE_DEFAULT_SIZE
@@ -319,173 +320,6 @@ GLOBAL_LIST_EMPTY(species_list)
 		else
 			return "unknown"
 
-/proc/do_mob(mob/user , mob/target, time = 30, uninterruptible = 0, progress = 1, datum/callback/extra_checks = null, ignorehelditem = FALSE, resume_time = 0 SECONDS)
-	if(!user || !target)
-		return 0
-	var/user_loc = user.loc
-
-	var/drifting = 0
-	if(!user.Process_Spacemove(0) && user.inertia_dir)
-		drifting = 1
-
-	var/target_loc = target.loc
-
-	var/holding = user.get_active_held_item()
-	var/datum/progressbar/progbar
-	if (progress)
-		progbar = new(user, time, target)
-
-	var/endtime = world.time+time
-	var/starttime = world.time
-	. = 1
-	while (world.time + resume_time < endtime)
-		stoplag(1)
-		if (progress)
-			progbar.update(world.time - starttime + resume_time)
-		if(QDELETED(user) || QDELETED(target))
-			. = 0
-			break
-		if(uninterruptible)
-			continue
-
-		if(drifting && !user.inertia_dir)
-			drifting = 0
-			user_loc = user.loc
-
-		if((!drifting && user.loc != user_loc) || target.loc != target_loc || (!ignorehelditem && user.get_active_held_item() != holding) || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
-			. = 0
-			break
-	if (progress)
-		qdel(progbar)
-
-
-//some additional checks as a callback for for do_afters that want to break on losing health or on the mob taking action
-/mob/proc/break_do_after_checks(list/checked_health, check_clicks)
-	if(check_clicks && next_move > world.time)
-		return FALSE
-	return TRUE
-
-//pass a list in the format list("health" = mob's health var) to check health during this
-/mob/living/break_do_after_checks(list/checked_health, check_clicks)
-	if(islist(checked_health))
-		if(health < checked_health["health"])
-			return FALSE
-		checked_health["health"] = health
-	return ..()
-
-/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null, required_mobility_flags = (MOBILITY_USE|MOBILITY_MOVE), resume_time = 0 SECONDS)
-	if(!user)
-		return 0
-	var/atom/Tloc = null
-	if(target && !isturf(target))
-		Tloc = target.loc
-
-	var/atom/Uloc = user.loc
-
-	var/drifting = 0
-	if(!user.Process_Spacemove(0) && user.inertia_dir)
-		drifting = 1
-
-	var/holding = user.get_active_held_item()
-
-	var/holdingnull = 1 //User's hand started out empty, check for an empty hand
-	if(holding)
-		holdingnull = 0 //Users hand started holding something, check to see if it's still holding that
-
-	delay *= user.do_after_coefficent()
-
-	var/datum/progressbar/progbar
-	if (progress)
-		progbar = new(user, delay, target)
-
-	var/endtime = world.time + delay
-	var/starttime = world.time
-	. = 1
-	var/mob/living/L = isliving(user) && user			//evals to last thing eval'd
-	while (world.time + resume_time < endtime)
-		stoplag(1)
-		if (progress)
-			progbar.update(world.time - starttime + resume_time)
-
-		if(drifting && !user.inertia_dir)
-			drifting = 0
-			Uloc = user.loc
-
-		if(L && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
-			. = 0
-			break
-
-		if(QDELETED(user) || user.stat || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
-			. = 0
-			break
-
-		if(!QDELETED(Tloc) && (QDELETED(target) || Tloc != target.loc))
-			if((Uloc != Tloc || Tloc != user) && !drifting)
-				. = 0
-				break
-
-		if(needhand)
-			//This might seem like an odd check, but you can still need a hand even when it's empty
-			//i.e the hand is used to pull some item/tool out of the construction
-			if(!holdingnull)
-				if(!holding)
-					. = 0
-					break
-			if(user.get_active_held_item() != holding)
-				. = 0
-				break
-	if (progress)
-		qdel(progbar)
-
-/mob/proc/do_after_coefficent() // This gets added to the delay on a do_after, default 1
-	. = 1
-	return
-
-/proc/do_after_mob(mob/user, var/list/targets, time = 30, uninterruptible = 0, progress = 1, datum/callback/extra_checks)
-	if(!user || !targets)
-		return 0
-	if(!islist(targets))
-		targets = list(targets)
-	var/user_loc = user.loc
-
-	var/drifting = 0
-	if(!user.Process_Spacemove(0) && user.inertia_dir)
-		drifting = 1
-
-	var/list/originalloc = list()
-	for(var/atom/target in targets)
-		originalloc[target] = target.loc
-
-	var/holding = user.get_active_held_item()
-	var/datum/progressbar/progbar
-	if(progress)
-		progbar = new(user, time, targets[1])
-
-	var/endtime = world.time + time
-	var/starttime = world.time
-	. = 1
-	mainloop:
-		while(world.time < endtime)
-			stoplag(1)
-			if(progress)
-				progbar.update(world.time - starttime)
-			if(QDELETED(user) || !targets)
-				. = 0
-				break
-			if(uninterruptible)
-				continue
-
-			if(drifting && !user.inertia_dir)
-				drifting = 0
-				user_loc = user.loc
-
-			for(var/atom/target in targets)
-				if((!drifting && user_loc != user.loc) || QDELETED(target) || originalloc[target] != target.loc || user.get_active_held_item() != holding || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
-					. = 0
-					break mainloop
-	if(progbar)
-		qdel(progbar)
-
 /proc/is_species(A, species_datum)
 	. = FALSE
 	if(ishuman(A))

code/_globalvars/bitfields.dm

@@ -49,6 +49,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"DROPDEL" = DROPDEL,
 		"NOBLUDGEON" = NOBLUDGEON,
 		"ABSTRACT" = ABSTRACT,
+		"ITEM_CAN_BLOCK" = ITEM_CAN_BLOCK,
+		"ITEM_CAN_PARRY" = ITEM_CAN_PARRY
 		),
 	"admin_flags" = list(
 		"BUILDMODE" = R_BUILDMODE,

code/_globalvars/lists/maintenance_loot.dm

@@ -118,3 +118,21 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/clothing/gloves/tackler/offbrand = 1,
 	"" = 3
 	))
+
+GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.
+			/obj/item/cigbutt,
+			/obj/item/trash/cheesie,
+			/obj/item/trash/candy,
+			/obj/item/trash/chips,
+			/obj/item/trash/pistachios,
+			/obj/item/trash/plate,
+			/obj/item/trash/popcorn,
+			/obj/item/trash/raisins,
+			/obj/item/trash/sosjerky,
+			/obj/item/trash/syndi_cakes))
+
+GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spawning coins.
+			/obj/item/coin/iron,
+			/obj/item/coin/silver,
+			/obj/item/coin/plastic,
+			/obj/item/coin/titanium))

code/_onclick/click.dm

@@ -17,10 +17,14 @@
 // eg: 10*0.5 = 5 deciseconds of delay
 // DOES NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK
 
+/mob/proc/timeToNextMove()
+	return max(0, next_move - world.time)
+
 /mob/proc/changeNext_move(num)
 	next_move = world.time + ((num+next_move_adjust)*next_move_modifier)
 
 /mob/living/changeNext_move(num)
+	last_click_move = next_move
 	var/mod = next_move_modifier
 	var/adj = next_move_adjust
 	for(var/i in status_effects)

code/_onclick/item_attack.dm

@@ -7,21 +7,17 @@
   *and lastly
   *afterattack. The return value does not matter.
   */
-/obj/item/proc/melee_attack_chain(mob/user, atom/target, params)
+/obj/item/proc/melee_attack_chain(mob/user, atom/target, params, flags, damage_multiplier = 1)
 	if(isliving(user))
 		var/mob/living/L = user
-		if(item_flags & NO_ATTACK_CHAIN_SOFT_STAMCRIT)
-			if(IS_STAMCRIT(L))
-				to_chat(L, "<span class='warning'>You are too exhausted to swing [src]!</span>")
-				return
-		if(!CHECK_MOBILITY(L, MOBILITY_USE))
+		if(!CHECK_MOBILITY(L, MOBILITY_USE) && !(flags & ATTACKCHAIN_PARRY_COUNTERATTACK))
 			to_chat(L, "<span class='warning'>You are unable to swing [src] right now!</span>")
 			return
 	if(tool_behaviour && target.tool_act(user, src, tool_behaviour))
 		return
 	if(pre_attack(target, user, params))
 		return
-	if(target.attackby(src,user, params))
+	if(target.attackby(src, user, params, flags, damage_multiplier))
 		return
 	if(QDELETED(src) || QDELETED(target))
 		return
@@ -56,23 +52,20 @@
 /obj/attackby(obj/item/I, mob/living/user, params)
 	return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_obj(src, user))
 
-/mob/living/attackby(obj/item/I, mob/living/user, params)
+/mob/living/attackby(obj/item/I, mob/living/user, params, attackchain_flags, damage_multiplier)
 	if(..())
 		return TRUE
-	user.changeNext_move(CLICK_CD_MELEE)
-	return I.attack(src, user)
+	I.attack_delay_done = FALSE //Should be set TRUE in pre_attacked_by()
+	. = I.attack(src, user, attackchain_flags, damage_multiplier)
+	if(!I.attack_delay_done) //Otherwise, pre_attacked_by() should handle it.
+		user.changeNext_move(I.click_delay)
 
-/obj/item/proc/attack(mob/living/M, mob/living/user)
+/obj/item/proc/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
 		return
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
 	if(item_flags & NOBLUDGEON)
 		return
-
-	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
-		return // CIT CHANGE - ditto
-
 	if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
@@ -86,12 +79,14 @@
 	M.lastattackerckey = user.ckey
 
 	user.do_attack_animation(M)
-	M.attacked_by(src, user)
+	M.attacked_by(src, user, attackchain_flags, damage_multiplier)
 
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)
 
-	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_MOB_MULT))//CIT CHANGE - makes attacking things cause stamina loss
+	var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT) //CIT CHANGE - makes attacking things cause stamina loss
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)
 
 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
@@ -99,23 +94,31 @@
 		return
 	if(item_flags & NOBLUDGEON)
 		return
-	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
-		return // CIT CHANGE - ditto
-	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_OBJ_MULT))//CIT CHANGE - makes attacking things cause stamina loss
-	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(O)
-	O.attacked_by(src, user)
+	if(!O.attacked_by(src, user))
+		user.changeNext_move(click_delay)
+	var/weight = getweight(user, STAM_COST_ATTACK_OBJ_MULT)
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)//CIT CHANGE - makes attacking things cause stamina loss
 
 /atom/movable/proc/attacked_by()
 	return
 
-/obj/attacked_by(obj/item/I, mob/living/user)
-	var/totitemdamage = I.force
+/obj/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+	var/totitemdamage = I.force * damage_multiplier
 	var/bad_trait
-	if(!SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		totitemdamage *= 0.5
+
+	var/stamloss = user.getStaminaLoss()
+	var/next_move_mult = 1
+	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
+		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
+		totitemdamage *= 1 - penalty
+		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
+	user.changeNext_move(I.click_delay*next_move_mult)
+
+	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
 		bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
+
 	if(I.used_skills && user.mind)
 		if(totitemdamage)
 			totitemdamage = user.mind.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_trait)
@@ -123,17 +126,21 @@
 			if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_OBJ))
 				continue
 			user.mind.auto_gain_experience(skill, I.skill_gain)
+
 	if(totitemdamage)
 		visible_message("<span class='danger'>[user] has hit [src] with [I]!</span>", null, null, COMBAT_MESSAGE_RANGE)
 		//only witnesses close by and the victim see a hit message.
 		log_combat(user, src, "attacked", I)
 	take_damage(totitemdamage, I.damtype, "melee", 1)
+	return TRUE
 
-/mob/living/attacked_by(obj/item/I, mob/living/user)
-	var/totitemdamage = pre_attacked_by(I, user)
-	if((user != src) && mob_run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, null, null) & BLOCK_SUCCESS)
+/mob/living/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+	var/list/block_return = list()
+	var/totitemdamage = pre_attacked_by(I, user) * damage_multiplier
+	if((user != src) && mob_run_block(I, totitemdamage, "the [I.name]", ((attackchain_flags & ATTACKCHAIN_PARRY_COUNTERATTACK)? ATTACK_TYPE_PARRY_COUNTERATTACK : NONE) | ATTACK_TYPE_MELEE, I.armour_penetration, user, null, block_return) & BLOCK_SUCCESS)
 		return FALSE
-	send_item_attack_message(I, user)
+	totitemdamage = block_calculate_resultant_damage(totitemdamage, block_return)
+	send_item_attack_message(I, user, null, totitemdamage)
 	I.do_stagger_action(src, user, totitemdamage)
 	if(I.force)
 		apply_damage(totitemdamage, I.damtype)
@@ -146,22 +153,40 @@
 					user.add_mob_blood(src)
 		return TRUE //successful attack
 
-/mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user)
+/mob/living/simple_animal/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	if(I.force < force_threshold || I.damtype == STAMINA)
 		playsound(loc, 'sound/weapons/tap.ogg', I.get_clamped_volume(), 1, -1)
+		user.changeNext_move(I.click_delay) //pre_attacked_by not called
 	else
 		return ..()
 
 /mob/living/proc/pre_attacked_by(obj/item/I, mob/living/user)
 	. = I.force
+	if(!.)
+		return
+
+	var/stamloss = user.getStaminaLoss()
+	var/stam_mobility_mult = 1
+	var/next_move_mult = 1
+	if(stamloss > STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do.
+		var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_ITEM_ATTACK_PENALTY
+		stam_mobility_mult -= penalty
+		next_move_mult += penalty*STAM_CRIT_ITEM_ATTACK_DELAY
+	if(stam_mobility_mult > LYING_DAMAGE_PENALTY && !CHECK_MOBILITY(user, MOBILITY_STAND)) //damage penalty for fighting prone, doesn't stack with the above.
+		stam_mobility_mult = LYING_DAMAGE_PENALTY
+	. *= stam_mobility_mult
+	user.changeNext_move(I.click_delay*next_move_mult)
+	I.attack_delay_done = TRUE
+
 	var/bad_trait
-	if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		. *= 0.5
-		bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
-	if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		. *= 1.5
-	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-		. *= 0.5
+	if(!(I.item_flags & NO_COMBAT_MODE_FORCE_MODIFIER))
+		if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
+			bad_trait = SKILL_COMBAT_MODE //blacklist combat skills.
+			if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE))
+				. *= 0.5
+		else if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
+			. *= 1.5
+
 	if(!user.mind || !I.used_skills)
 		return
 	if(.)
@@ -171,7 +196,6 @@
 			continue
 		user.mind.auto_gain_experience(skill, I.skill_gain)
 
-
 // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
 // Click parameters is the params string from byond Click() code, see that documentation.
 /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -185,10 +209,12 @@
 		else
 			return clamp(w_class * 6, 10, 100) // Multiply the item's weight class by 6, then clamp the value between 10 and 100
 
-/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area)
+/mob/living/proc/send_item_attack_message(obj/item/I, mob/living/user, hit_area, current_force)
 	var/message_verb = "attacked"
 	if(I.attack_verb && I.attack_verb.len)
 		message_verb = "[pick(I.attack_verb)]"
+	if(current_force < I.force * FEEBLE_ATTACK_MSG_THRESHOLD)
+		message_verb = "[pick("feebly", "limply", "saplessly")] [message_verb]"
 	else if(!I.force)
 		return
 	var/message_hit_area = ""
@@ -215,6 +241,8 @@
 		bad_trait = SKILL_COMBAT_MODE
 	if(used_skills && user.mind)
 		. = user.mind.item_action_skills_mod(src, ., skill_difficulty, trait, bad_trait, FALSE)
+	var/total_health = user.getStaminaLoss()
+	. = clamp(., 0, STAMINA_NEAR_CRIT - total_health)
 
 /// How long this staggers for. 0 and negatives supported.
 /obj/item/proc/melee_stagger_duration(force_override)

code/controllers/configuration/entries/game_options.dm

@@ -435,6 +435,10 @@
 	config_entry_value = 64
 	min_val = 0
 
+/datum/config_entry/number/ratcap
+	config_entry_value = 64
+	min_val = 0
+
 /datum/config_entry/flag/disable_stambuffer
 
 /datum/config_entry/keyed_list/box_random_engine

code/controllers/subsystem/mobs.dm

@@ -8,6 +8,7 @@ SUBSYSTEM_DEF(mobs)
 	var/static/list/clients_by_zlevel[][]
 	var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that.
 	var/static/list/cubemonkeys = list()
+	var/static/list/cheeserats = list()
 
 /datum/controller/subsystem/mobs/stat_entry()
 	..("P:[GLOB.mob_living_list.len]")

code/controllers/subsystem/research.dm

@@ -307,7 +307,11 @@ SUBSYSTEM_DEF(research)
 	for(var/A in subtypesof(/obj/item/seeds))
 		var/obj/item/seeds/S = A
 		var/list/L = list()
-		L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2
+		//First we get are yield and rarity and times it by two
+		//Then we subtract production and maturation, making it so faster growing plants are better for RnD
+		//Then we add in lifespan and potency,
+		//A basic seed can be worth 268 points if its the best it can be.
+		L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2 + initial(S.yield) * 2 - initial(S.maturation) - initial(S.production) + initial(S.lifespan) + initial(S.potency)
 		techweb_point_items[S] = L
 
 	return ..()

code/datums/components/combat_mode.dm

@@ -119,6 +119,8 @@
 	if(hud_icon)
 		hud_icon.combat_on = FALSE
 		hud_icon.update_icon()
+	source.stop_active_blocking()
+	source.end_parry_sequence()
 
 ///Changes the user direction to (try) keep match the pointer.
 /datum/component/combat_mode/proc/on_move(atom/movable/source, dir, atom/oldloc, forced)

code/datums/components/crafting/guncrafting.dm

@@ -35,17 +35,34 @@ k// PARTS //
 	desc = "A twenty bore shotgun barrel."
 	icon_state = "barrel_shotgun"
 
+/obj/item/weaponcrafting/improvised_parts/barrel_pistol
+	name = "pistol barrel"
+	desc = "A pipe with a small diameter and some holes finely cut into it. It fits .32 ACP bullets. Probably."
+	icon_state = "barrel_pistol"
+	w_class = WEIGHT_CLASS_SMALL
+
 // RECEIVERS
 
 /obj/item/weaponcrafting/improvised_parts/rifle_receiver
 	name = "bolt action receiver"
-	desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle."
+	desc = "A crudely constructed receiver to create an improvised bolt-action breechloaded rifle. It's generic enough to modify to create other rifles, potentially."
 	icon_state = "receiver_rifle"
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/weaponcrafting/improvised_parts/pistol_receiver
+	name = "pistol receiver"
+	desc = "A receiver to connect house and connects all the parts to make an improvised pistol."
+	icon_state = "receiver_pistol"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weaponcrafting/improvised_parts/laser_receiver
+	name = "energy emitter assembly"
+	desc = "A mixture of components haphazardly wired together to form an energy emitter."
+	icon_state = "laser_assembly"
+
 /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
 	name = "break-action assembly"
-	desc = "An improvised receiver to create a break-action breechloaded shotgun."
+	desc = "An improvised receiver to create a break-action breechloaded shotgun. Parts of this are still useful if you want to make another type of shotgun, however."
 	icon_state = "receiver_shotgun"
 	w_class = WEIGHT_CLASS_SMALL
 
@@ -62,3 +79,14 @@ k// PARTS //
 	desc = "A crudely fashioned wooden body to help keep higher calibre improvised weapons from blowing themselves apart."
 	icon_state = "wooden_body"
 
+/obj/item/weaponcrafting/improvised_parts/wooden_grip
+	name = "wooden pistol grip"
+	desc = "A nice wooden grip hollowed out for pistol magazines."
+	icon_state = "wooden_pistolgrip"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/weaponcrafting/improvised_parts/makeshift_lens
+	name = "makeshift focusing lens"
+	desc = "A properly made lens made with actual glassworking tools would perform much better, but this will have to do."
+	icon_state = "focusing_lens"
+	w_class = WEIGHT_CLASS_TINY

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -6,7 +6,7 @@
 	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	time = 50
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_OTHER
 
 /datum/crafting_recipe/pin_removal/check_requirements(mob/user, list/collected_requirements)
 	var/obj/item/gun/G = collected_requirements[/obj/item/gun][1]
@@ -22,7 +22,7 @@
 				/obj/item/shield/riot = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/strobeshield/New()
 	..()
@@ -38,7 +38,7 @@
 	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	time = 100
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/spear
 	name = "Spear"
@@ -49,7 +49,7 @@
 	parts = list(/obj/item/shard = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/stunprod
 	name = "Stunprod"
@@ -59,7 +59,7 @@
 				/obj/item/assembly/igniter = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/teleprod
 	name = "Teleprod"
@@ -70,7 +70,7 @@
 				/obj/item/stack/ore/bluespace_crystal = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/bola
 	name = "Bola"
@@ -88,7 +88,7 @@
 	            /obj/item/stack/sheet/metal = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/tailwhip
 	name = "Liz O' Nine Tails"
@@ -97,7 +97,7 @@
 				/obj/item/stack/cable_coil = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/catwhip
 	name = "Cat O' Nine Tails"
@@ -106,7 +106,7 @@
 				/obj/item/stack/cable_coil = 1)
 	time = 40
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 /datum/crafting_recipe/chainsaw
 	name = "Chainsaw"
@@ -117,7 +117,7 @@
 	tools = list(TOOL_WELDER)
 	time = 50
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 //////////////////
 ///BOMB CRAFTING//
@@ -134,7 +134,7 @@
 	parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
 	time = 30
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_OTHER
 
 /datum/crafting_recipe/chemical_payload2
 	name = "Chemical Payload (Gibtonite)"
@@ -147,7 +147,7 @@
 	parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
 	time = 50
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_OTHER
 
 /datum/crafting_recipe/molotov
 	name = "Molotov"
@@ -169,7 +169,7 @@
 	parts = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1)
 	time = 15
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_OTHER
 
 /datum/crafting_recipe/lance
 	name = "Explosive Lance (Grenade)"
@@ -180,7 +180,7 @@
 				/obj/item/grenade = 1)
 	time = 15
 	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
+	subcategory = CAT_MELEE
 
 //////////////////
 ///GUNS CRAFTING//
@@ -276,6 +276,49 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
+/datum/crafting_recipe/ipistol
+	name = "Improvised Pistol (.32)"
+	result = /obj/item/gun/ballistic/automatic/pistol/improvised/nomag
+	reqs = list(/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 1,
+				/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 1,
+				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
+				/obj/item/weaponcrafting/improvised_parts/wooden_grip = 1,
+				/obj/item/stack/sheet/plastic = 15,
+				/obj/item/stack/sheet/plasteel = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WIRECUTTER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/ilaser
+	name = "Improvised Energy Gun"
+	result = /obj/item/gun/energy/e_gun/old/improvised
+	reqs = list(/obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
+				/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 1,
+				/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 1,
+				/obj/item/stock_parts/cell = 1,
+				/obj/item/stack/sheet/metal = 10,
+				/obj/item/stack/sheet/plasteel = 5,
+				/obj/item/stack/cable_coil = 10)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/ilaser/upgraded
+	name = "Improvised Energy Gun Upgrade"
+	result = /obj/item/gun/energy/e_gun/old/improvised/upgraded
+	reqs = list(/obj/item/gun/energy/e_gun/old/improvised = 1,
+				/obj/item/glasswork/glass_base/lens = 1,
+				/obj/item/stock_parts/capacitor/quadratic = 2,
+				/obj/item/stock_parts/micro_laser/ultra = 1,
+				/obj/item/stock_parts/cell/bluespace = 1,
+				/obj/item/stack/cable_coil = 5)
+	tools = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
 //////////////////
 ///AMMO CRAFTING//
 //////////////////
@@ -399,6 +442,17 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
 
+/datum/crafting_recipe/m32acp
+	name = ".32ACP Empty Magazine"
+	result = /obj/item/ammo_box/magazine/m32acp/empty
+	reqs = list(/obj/item/stack/sheet/metal = 3,
+				/obj/item/stack/sheet/plasteel = 1,
+				/obj/item/stack/packageWrap = 1)
+	tools = list(TOOL_WELDER,TOOL_SCREWDRIVER)
+	time = 5
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+
 ////////////////////
 // PARTS CRAFTING //
 ////////////////////
@@ -423,13 +477,24 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
 
+/datum/crafting_recipe/pistol_barrel
+	name = "Improvised Pistol Barrel"
+	result = /obj/item/weaponcrafting/improvised_parts/barrel_pistol
+	reqs = list(/obj/item/pipe = 1,
+				/obj/item/stack/sheet/plasteel = 1)
+	tools = list(TOOL_WELDER,TOOL_SAW)
+	time = 150
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
 // RECEIVERS
 
 /datum/crafting_recipe/rifle_receiver
 	name = "Improvised Rifle Receiver"
 	result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 20)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Rifle is the easiest to craft and can be made at an autolathe, this is a very light kick in the shin for dual-wielding ishotguns.
+	reqs = list(/obj/item/stack/sheet/metal = 10,
+				/obj/item/stack/sheet/plasteel = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
 	time = 50
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
@@ -439,11 +504,33 @@
 	result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
 	reqs = list(/obj/item/stack/sheet/metal = 10,
 				/obj/item/stack/sheet/plasteel = 1)
-	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Increased cost is to stop dual-wield alpha striking. ishotgun is a rvolver and can be duel-wielded
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) // Dual wielding has been removed, plasteel is a soft timesink to obtain for most to make mass production harder.
 	time = 50
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
 
+/datum/crafting_recipe/pistol_receiver
+	name = "Improvised Pistol Receiver"
+	result = /obj/item/weaponcrafting/improvised_parts/pistol_receiver
+	reqs = list(/obj/item/stack/sheet/metal = 5,
+				/obj/item/stack/sheet/plasteel = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_SAW)
+	time = 50
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
+/datum/crafting_recipe/laser_receiver
+	name = "Energy Weapon Assembly"
+	result = /obj/item/weaponcrafting/improvised_parts/laser_receiver
+	reqs = list(/obj/item/stack/sheet/metal = 10,
+				/obj/item/stock_parts/capacitor = 2,
+				/obj/item/stock_parts/micro_laser = 1,
+				/obj/item/assembly/prox_sensor = 1)
+	tools = list(TOOL_SCREWDRIVER, TOOL_MULTITOOL, TOOL_WELDER) // Prox sensor and multitool for the circuit board, welder for extremely ghetto soldering.
+	time = 150
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS
+
 // MISC
 
 /datum/crafting_recipe/trigger_assembly
@@ -455,3 +542,13 @@
 	time = 150
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
+
+/datum/crafting_recipe/makeshift_lens
+	name = "Makeshift Lens"
+	result = /obj/item/weaponcrafting/improvised_parts/makeshift_lens
+	reqs = list(/obj/item/stack/sheet/metal = 1,
+				/obj/item/stack/sheet/glass = 2)
+	tools = list(TOOL_WELDER) // Glassmaking lets you make non-makeshift lenses.
+	time = 50
+	category = CAT_WEAPONRY
+	subcategory = CAT_PARTS

code/datums/components/material_container.dm

@@ -73,7 +73,7 @@
 	if(!material_amount)
 		to_chat(user, "<span class='warning'>[I] does not contain sufficient materials to be accepted by [parent].</span>")
 		return
-	if((!precise_insertion || !GLOB.typecache_stack[I]) && !has_space(material_amount))
+	if((!precise_insertion || !GLOB.typecache_stack[I.type]) && !has_space(material_amount))
 		to_chat(user, "<span class='warning'>[parent] has not enough space. Please remove materials from [parent] in order to insert more.</span>")
 		return
 	user_insert(I, user)

code/datums/components/mood.dm

@@ -25,7 +25,7 @@
 
 	var/mob/living/owner = parent
 	if(owner.stat != DEAD)
-		START_PROCESSING(SSdcs, src)
+		START_PROCESSING(SSobj, src)
 
 	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
@@ -40,12 +40,12 @@
 		hud.show_hud(hud.hud_version)
 
 /datum/component/mood/Destroy()
-	STOP_PROCESSING(SSdcs, src)
+	STOP_PROCESSING(SSobj, src)
 	unmodify_hud()
 	return ..()
 
 /datum/component/mood/proc/stop_processing()
-	STOP_PROCESSING(SSdcs, src)
+	STOP_PROCESSING(SSobj, src)
 
 /datum/component/mood/proc/print_mood(mob/user)
 	var/msg = "<span class='info'>*---------*\n<EM>Your current mood</EM>\n"
@@ -138,7 +138,7 @@
 		else
 			screen_obj.icon_state = "mood[mood_level]"
 
-/datum/component/mood/process() //Called on SSdcs process
+/datum/component/mood/process() //Called on SSobj process
 	if(QDELETED(parent)) // workaround to an obnoxious sneaky periodical runtime.
 		qdel(src)
 		return
@@ -345,7 +345,7 @@
 
 ///Called when parent is revived.
 /datum/component/mood/proc/on_revive(datum/source, full_heal)
-	START_PROCESSING(SSdcs, src)
+	START_PROCESSING(SSobj, src)
 	if(!full_heal)
 		return
 	remove_temp_moods()

code/datums/components/storage/concrete/pockets.dm

@@ -57,7 +57,7 @@
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
 		/obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol,
-		/obj/item/toy/plush/snakeplushie
+		/obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini
 		))
 
 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()
@@ -68,7 +68,7 @@
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
 		/obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper,
 		/obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini,
-		/obj/item/firing_pin, /obj/item/bikehorn, /obj/item/gun/ballistic/automatic/pistol))
+		/obj/item/firing_pin, /obj/item/bikehorn, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/energy/e_gun/mini))
 
 /datum/component/storage/concrete/pockets/pocketprotector
 	max_items = 3

code/datums/components/swarming.dm

@@ -11,6 +11,17 @@
 	RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/join_swarm)
 	RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/leave_swarm)
 
+/datum/component/swarming/Destroy()
+	if(is_swarming)
+		for(var/A in swarm_members)
+			var/datum/component/swarming/other_swarm = A
+			other_swarm.swarm_members -= src
+			swarm_members -= other_swarm
+			if(!length(other_swarm.swarm_members))
+				other_swarm.unswarm()
+		unswarm()
+	return ..()
+
 /datum/component/swarming/proc/join_swarm(datum/source, atom/movable/AM)
 	var/datum/component/swarming/other_swarm = AM.GetComponent(/datum/component/swarming)
 	if(!other_swarm)

code/datums/components/tackle.dm

@@ -163,24 +163,24 @@
 		if(-4 to -2) // glancing blow at best
 			user.visible_message("<span class='warning'>[user] lands a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!</span>", "<span class='userdanger'>You land a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!</span>", target)
 			to_chat(target, "<span class='userdanger'>[user] lands a weak [tackle_word] on you, briefly knocking you off-balance!</span>")
-
 			user.Knockdown(30)
+			target.adjustStaminaLoss(15)
 			target.apply_status_effect(STATUS_EFFECT_TASED_WEAK, 6 SECONDS)
 
 		if(-1 to 0) // decent hit, both parties are about equally inconvenienced
 			user.visible_message("<span class='warning'>[user] lands a passable [tackle_word] on [target], sending them both tumbling!</span>", "<span class='userdanger'>You land a passable [tackle_word] on [target], sending you both tumbling!</span>", target)
 			to_chat(target, "<span class='userdanger'>[user] lands a passable [tackle_word] on you, sending you both tumbling!</span>")
 
-			target.adjustStaminaLoss(stamina_cost)
+			target.adjustStaminaLoss(stamina_cost * 1.5)
 			target.Paralyze(5)
 			user.Knockdown(20)
-			target.Knockdown(25)
+			target.Knockdown(30)
 
 		if(1 to 2) // solid hit, tackler has a slight advantage
 			user.visible_message("<span class='warning'>[user] lands a solid [tackle_word] on [target], knocking them both down hard!</span>", "<span class='userdanger'>You land a solid [tackle_word] on [target], knocking you both down hard!</span>", target)
 			to_chat(target, "<span class='userdanger'>[user] lands a solid [tackle_word] on you, knocking you both down hard!</span>")
 
-			target.adjustStaminaLoss(30)
+			target.adjustStaminaLoss(40)
 			target.Paralyze(5)
 			user.Knockdown(10)
 			target.Knockdown(20)
@@ -192,9 +192,9 @@
 			user.SetKnockdown(0)
 			user.set_resting(FALSE, TRUE, FALSE)
 			user.forceMove(get_turf(target))
-			target.adjustStaminaLoss(40)
-			target.Paralyze(5)
-			target.Knockdown(30)
+			target.adjustStaminaLoss(50)
+			target.Paralyze(3) //Otherwise the victim can just instantly get out of the grab.
+			target.DefaultCombatKnockdown(20) //So they cant get up instantly.
 			if(ishuman(target) && iscarbon(user))
 				target.grabbedby(user)
 
@@ -205,9 +205,9 @@
 			user.SetKnockdown(0)
 			user.set_resting(FALSE, TRUE, FALSE)
 			user.forceMove(get_turf(target))
-			target.adjustStaminaLoss(40)
-			target.Paralyze(5)
-			target.Knockdown(30)
+			target.adjustStaminaLoss(65)
+			target.Paralyze(10) 
+			target.DefaultCombatKnockdown(20)
 			if(ishuman(target) && iscarbon(user))
 				target.grabbedby(user)
 				target.grippedby(user, instant = TRUE)

code/datums/dog_fashion.dm

@@ -175,11 +175,6 @@
 	name = "Trooper REAL_NAME"
 	desc = "That's not red paint. That's real corgi blood."
 
-/datum/dog_fashion/head/colour
-	name = "Stylish REAL_NAME"
-	desc = "From the tips of their paws to the top of their head, they look like a made bed."
-	emote_see = list("tries to tap dances.","looks sadly at others outfits...","barks at bad fashion!")
-
 /datum/dog_fashion/head/telegram
 	name = "Messenger REAL_NAME"
 	desc = "Dont shoot the messenger..."

code/datums/elements/earhealing.dm

@@ -4,7 +4,7 @@
 	var/list/user_by_item = list()
 
 /datum/element/earhealing/New()
-	START_PROCESSING(SSdcs, src)
+	START_PROCESSING(SSobj, src)
 
 /datum/element/earhealing/Attach(datum/target)
 	. = ..()

code/datums/elements/flavor_text.dm

@@ -117,9 +117,9 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 		return FALSE
 
 	var/lower_name = lowertext(flavor_name)
-	var/new_text = stripped_multiline_input(user, "Set the [lower_name] displayed on 'examine'. [addendum]", flavor_name, texts_by_atom[usr], max_len, TRUE)
+	var/new_text = stripped_multiline_input(user, "Set the [lower_name] displayed on 'examine'. [addendum]", flavor_name, html_decode(texts_by_atom[usr]), max_len, TRUE)
 	if(!isnull(new_text) && (user in texts_by_atom))
-		texts_by_atom[user] = html_decode(new_text)
+		texts_by_atom[user] = new_text
 		to_chat(src, "Your [lower_name] has been updated.")
 		return TRUE
 	return FALSE

code/datums/elements/photosynthesis.dm

@@ -0,0 +1,81 @@
+/datum/element/photosynthesis
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	id_arg_index = 2
+	///how much brute damage (or integrity, for objects) is healed (taken if positive) at maximum luminosity. (if lum_minus were 0)
+	var/light_bruteheal = -1
+	///how much burn damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_burnheal = -1
+	///how much tox damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_toxheal = -1
+	///how much oxy damage is restored/taken at maximum luminosity. Mobs only.
+	var/light_oxyheal = -1
+	///how nutrition recovery/expenses factor, not affected by bonus_lum and malus_lum. Mobs only.
+	var/light_nutrition_gain = 4
+	///A value subtracted to the lum count, which allows targets to wilt or heal in the darkness.
+	var/lum_minus = 0.5
+	///the minimum lum count over which where the target damage is adjusted.
+	var/bonus_lum = 0.2
+	///the maximum lum count under which the target damage is inversely adjusted.
+	var/malus_lum = 0
+	///List of atoms this element is attached to. Doubles as a multiplier if the same element is attached multiple times to a target multiple times.
+	var/list/attached_atoms
+
+/datum/element/photosynthesis/Attach(datum/target, brute = -1, burn = -1, tox = -1, oxy = -1, nutri = 4, minus = 0.2, bonus = 0.3, malus = -0.1)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE || !(isliving(target) || (isobj(target) && light_bruteheal)))
+		return ELEMENT_INCOMPATIBLE
+	light_bruteheal = brute
+	light_burnheal = burn
+	light_toxheal = tox
+	light_oxyheal = oxy
+	light_nutrition_gain = nutri
+	lum_minus = minus
+	bonus_lum = bonus
+	malus_lum = malus
+
+	if(!attached_atoms)
+		attached_atoms = list()
+		START_PROCESSING(SSobj, src)
+	attached_atoms[target]++
+
+/datum/element/photosynthesis/Detach(datum/target)
+	attached_atoms[target]--
+	if(!attached_atoms[target])
+		attached_atoms -= target
+		if(!length(attached_atoms))
+			STOP_PROCESSING(SSobj, src)
+			attached_atoms = null
+	return ..()
+
+/datum/element/photosynthesis/process()
+	for(var/A in attached_atoms)
+		var/atom/movable/AM = A
+		var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
+		if(isturf(AM.loc)) //else, there's considered to be no light
+			var/turf/T = AM.loc
+			light_amount = (T.get_lumcount() - lum_minus)
+
+		if(isliving(AM))
+			var/mob/living/L = AM
+			if(L.stat == DEAD)
+				continue
+			if(light_nutrition_gain)
+				L.adjust_nutrition(light_amount * light_nutrition_gain * attached_atoms[AM], NUTRITION_LEVEL_FULL)
+			if(light_amount > bonus_lum || light_amount < malus_lum)
+				var/mult = ((light_amount > bonus_lum) ? 1 : -1) * attached_atoms[AM]
+				if(light_bruteheal)
+					L.adjustBruteLoss(light_bruteheal * mult)
+				if(light_burnheal)
+					L.adjustFireLoss(light_burnheal * mult)
+				if(light_toxheal)
+					L.adjustToxLoss(light_toxheal * mult)
+				if(light_oxyheal)
+					L.adjustOxyLoss(light_oxyheal * mult)
+
+		else if(light_amount > bonus_lum || light_amount < malus_lum)
+			var/obj/O = AM
+			var/damage = light_bruteheal * ((light_amount > bonus_lum) ? 1 : -1) * attached_atoms[AM]
+			if(damage < 0 && O.obj_integrity < O.max_integrity)
+				O.obj_integrity = min(O.obj_integrity + damage, O.max_integrity) //Till we get a obj heal proc...
+			else
+				O.take_damage(damage, BRUTE, FALSE, FALSE, null, 100)

code/datums/martial/_martial.dm

@@ -10,6 +10,10 @@
 	var/help_verb
 	var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist.
 	var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts
+	/// Can we be used to unarmed parry?
+	var/can_martial_parry = FALSE
+	/// Set this variable to something not null, this'll be the preferred unarmed parry in most cases if [can_martial_parry] is TRUE. YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
+	var/datum/block_parry_data/block_parry_data
 	var/pugilist = FALSE
 
 /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -91,4 +95,4 @@
 
 ///Gets called when a projectile hits the owner. Returning anything other than BULLET_ACT_HIT will stop the projectile from hitting the mob.
 /datum/martial_art/proc/on_projectile_hit(mob/living/carbon/human/A, obj/item/projectile/P, def_zone)
-	return BULLET_ACT_HIT
+	return BULLET_ACT_HIT

code/datums/martial/boxing.dm

@@ -66,9 +66,9 @@
 	return
 
 /obj/item/clothing/gloves/boxing/dropped(mob/user)
+	. = ..()
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/H = user
 	if(H.get_item_by_slot(SLOT_GLOVES) == src)
 		style.remove(H)
-	return

code/datums/martial/krav_maga.dm

@@ -203,6 +203,7 @@
 		style.teach(H,1)
 
 /obj/item/clothing/gloves/krav_maga/dropped(mob/user)
+	. = ..()
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/H = user

code/datums/martial/wrestling.dm

@@ -480,12 +480,12 @@
 	return
 
 /obj/item/storage/belt/champion/wrestling/dropped(mob/user)
+	. = ..()
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/H = user
 	if(H.get_item_by_slot(SLOT_BELT) == src)
 		style.remove(H)
-	return
 
 //Subtype of wrestling, reserved for the wrestling belts found in the holodeck
 /datum/martial_art/wrestling/holodeck

code/datums/mind.dm

@@ -331,14 +331,20 @@
 
 /datum/mind/proc/enslave_mind_to_creator(mob/living/creator)
 	if(iscultist(creator))
-		SSticker.mode.add_cultist(src)
+		if(iscultist(creator, TRUE))
+			SSticker.mode.add_cultist(src)
+		else
+			src.add_antag_datum(/datum/antagonist/cult/neutered/traitor)
 
 	else if(is_revolutionary(creator))
 		var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE)
 		converter.add_revolutionary(src,FALSE)
 
 	else if(is_servant_of_ratvar(creator))
-		add_servant_of_ratvar(current)
+		if(is_servant_of_ratvar(creator, TRUE))
+			add_servant_of_ratvar(current)
+		else
+			add_servant_of_ratvar(current, FALSE, FALSE, /datum/antagonist/clockcult/neutered/traitor)
 
 	else if(is_nuclear_operative(creator))
 		var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE)

code/datums/shuttles.dm

@@ -170,6 +170,11 @@
 	port_id = "snowdin"
 	can_be_bought = FALSE
 
+/datum/map_template/shuttle/snow_taxi
+	port_id = "snow"
+	can_be_bought = FALSE
+	suffix = "taxi"
+
 // Shuttles start here:
 
 /datum/map_template/shuttle/emergency/backup
@@ -557,6 +562,10 @@
 	suffix = "cog"
 	name = "arrival shuttle (Cog)"
 
+/datum/map_template/shuttle/arrival/snaxi
+	suffix = "snaxi"
+	name = "arrival shuttle (Snaxi)"
+
 /datum/map_template/shuttle/aux_base/default
 	suffix = "default"
 	name = "auxilliary base (Default)"

code/datums/skills/_skill_holder.dm

@@ -209,7 +209,7 @@
 /datum/mind/proc/skill_html_readout()
 	var/list/out = list("<center><h1>Skills</h1></center><hr>")
 	out += "<table style=\"width:100%\"><tr><th><b>Skill</b><th><b>Value</b></tr>"
-	for(var/path in skill_holder.skills|skill_holder.skill_value_mods|skill_holder.skill_level_mods)
+	for(var/path in GLOB.skill_datums)
 		var/datum/skill/S = GLOB.skill_datums[path]
 		var/skill_value = get_skill_value(path)
 		var/skill_level = get_skill_level(path, round = TRUE)

code/datums/weather/weather_types/radiation_storm.dm

@@ -18,7 +18,7 @@
 
 	area_type = /area
 	protected_areas = list(/area/maintenance, /area/ai_monitored/turret_protected/ai_upload, /area/ai_monitored/turret_protected/ai_upload_foyer,
-	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation)
+	/area/ai_monitored/turret_protected/ai, /area/storage/emergency/starboard, /area/storage/emergency/port, /area/shuttle, /area/security/prison, /area/ruin, /area/space/nearstation, /area/icemoon)
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"

code/game/area/areas/shuttles.dm

@@ -200,4 +200,7 @@
 	name = "Tiny Freighter"
 
 /area/shuttle/caravan/freighter3
-	name = "Tiny Freighter"
+	name = "Tiny Freighter"
+
+/area/shuttle/snowtaxi
+	name = "Snow Taxi"

code/game/gamemodes/gangs/dominator.dm

@@ -145,9 +145,9 @@
 		new /obj/item/stack/sheet/plasteel(src.loc)
 	qdel(src)
 
-/obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user)
+/obj/machinery/dominator/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	add_fingerprint(user)
-	..()
+	return ..()
 
 /obj/machinery/dominator/attack_hand(mob/user)
 	if(operating || (stat & BROKEN))
@@ -240,4 +240,4 @@
 
 #undef DOM_BLOCKED_SPAM_CAP
 #undef DOM_REQUIRED_TURFS
-#undef DOM_HULK_HITS_REQUIRED
+#undef DOM_HULK_HITS_REQUIRED

code/game/gamemodes/objective_items.dm

@@ -36,7 +36,7 @@
 	targetitem = /obj/item/gun/energy/e_gun/hos
 	difficulty = 10
 	excludefromjob = list("Head Of Security")
-	altitems = list(/obj/item/gun/ballistic/revolver/mws)
+	altitems = list(/obj/item/gun/ballistic/revolver/mws, /obj/item/choice_beacon/hosgun) //We now look for eather the alt verson of the hos gun or the beacon picker.
 
 /datum/objective_item/steal/handtele
 	name = "a hand teleporter."

code/game/machinery/doors/airlock_electronics.dm

@@ -1,7 +1,7 @@
 /obj/item/electronics/airlock
 	name = "airlock electronics"
 	req_access = list(ACCESS_MAINT_TUNNELS)
-	custom_price = 50
+	custom_price = PRICE_CHEAP
 
 	var/list/accesses = list()
 	var/one_access = 0

code/game/machinery/doors/firedoor.dm

@@ -260,7 +260,7 @@
 
 /obj/item/electronics/firelock
 	name = "firelock circuitry"
-	custom_price = 50
+	custom_price = PRICE_CHEAP
 	desc = "A circuit board used in construction of firelocks."
 	icon_state = "mainboard"
 

code/game/machinery/firealarm.dm

@@ -2,7 +2,7 @@
 
 /obj/item/electronics/firealarm
 	name = "fire alarm electronics"
-	custom_price = 50
+	custom_price = PRICE_CHEAP
 	desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
 
 /obj/item/wallframe/firealarm

code/game/machinery/porta_turret/portable_turret_cover.dm

@@ -70,8 +70,8 @@
 	else
 		return ..()
 
-/obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user)
-	parent_turret.attacked_by(I, user)
+/obj/machinery/porta_turret_cover/attacked_by(obj/item/I, mob/user, attackchain_flags = NONE, damage_multiplier = 1)
+	return parent_turret.attacked_by(I, user)
 
 /obj/machinery/porta_turret_cover/attack_alien(mob/living/carbon/alien/humanoid/user)
 	parent_turret.attack_alien(user)

code/game/machinery/recycler.dm

@@ -100,44 +100,61 @@
 	eat(AM)
 	. = ..()
 
-/obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+/obj/machinery/recycler/proc/eat(atom/AM0)
 	if(stat & (BROKEN|NOPOWER) || safety_mode)
 		return
 
 	var/list/to_eat
 
-	to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
+	to_eat = list(AM0)
 
 	var/items_recycled = 0
+	var/buzz = FALSE
 	for(var/i in to_eat)
 		var/atom/movable/AM = i
+		if(QDELETED(AM))
+			continue
 		var/obj/item/bodypart/head/as_head = AM
 		var/obj/item/mmi/as_mmi = AM
-		var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || isbrain(AM) || istype(AM, /obj/item/dullahan_relay)
+		var/brain_holder = istype(AM, /obj/item/organ/brain) || (istype(as_head) && as_head.brain) || (istype(as_mmi) && as_mmi.brain) || istype(AM, /obj/item/dullahan_relay)
 		if(brain_holder)
-			emergency_stop(AM)
-		else if(isliving(AM))
-			if((obj_flags & EMAGGED)||((!allowed(AM))&&(!ishuman(AM))))
-				crush_living(AM)
+			if(obj_flags & EMAGGED)
+				continue
 			else
 				emergency_stop(AM)
+				return
+		else if(isliving(AM))
+			if((obj_flags & EMAGGED)||((!allowed(AM))&&(!ishuman(AM))))
+				to_eat += crush_living(AM)
+			else
+				emergency_stop(AM)
+				return
 		else if(isitem(AM))
 			var/obj/O = AM
 			if(O.resistance_flags & INDESTRUCTIBLE)
-				playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+				buzz = TRUE
 				O.forceMove(loc)
 			else
-				recycle_item(AM)
+				to_eat += recycle_item(AM)
 				items_recycled++
 		else
-			playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+			buzz = TRUE
 			AM.forceMove(loc)
 
-	if(items_recycled && sound)
+	if(items_recycled)
 		playsound(src, item_recycle_sound, 50, 1)
+	if(buzz)
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
 
 /obj/machinery/recycler/proc/recycle_item(obj/item/I)
 
+	. = list()
+	for(var/A in I)
+		var/atom/movable/AM = A
+		AM.forceMove(loc)
+		if(AM.loc == loc)
+			. += AM
+
 	I.forceMove(loc)
 	var/obj/item/grown/log/L = I
 	if(istype(L))
@@ -172,6 +189,7 @@
 
 /obj/machinery/recycler/proc/crush_living(mob/living/L)
 
+	. = list()
 	L.forceMove(loc)
 
 	if(issilicon(L))
@@ -193,7 +211,7 @@
 	if(eat_victim_items)
 		for(var/obj/item/I in L.get_equipped_items(TRUE))
 			if(L.dropItemToGround(I))
-				eat(I, sound=FALSE)
+				. += I
 
 	// Instantly lie down, also go unconscious from the pain, before you die.
 	L.Unconscious(100)

code/game/machinery/requests_console.dm

@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 #define NO_NEW_MESSAGE				0
 #define NORMAL_MESSAGE_PRIORITY 	1
 #define HIGH_MESSAGE_PRIORITY		2
-#define EXTREME_MESSAGE_PRIORITY	3 // not implemented, will probably require some hacking... everything needs to have a hidden feature in this game.
+#define EXTREME_MESSAGE_PRIORITY	3 // is implimented, does require hacking. everything needs to have a hidden feature in this game.
 
 /obj/machinery/requests_console
 	name = "requests console"
@@ -48,9 +48,9 @@ GLOBAL_LIST_EMPTY(allConsoles)
 	var/announceAuth = FALSE //Will be set to 1 when you authenticate yourself for announcements
 	var/msgVerified = "" //Will contain the name of the person who verified it
 	var/msgStamped = "" //If a message is stamped, this will contain the stamp name
-	var/message = "";
-	var/dpt = ""; //the department which will be receiving the message
-	var/priority = -1 ; //Priority of the message being sent
+	var/message = ""
+	var/dpt = "" //the department which will be receiving the message
+	var/priority = NORMAL_MESSAGE_PRIORITY //Priority of the message being sent. why is the default -1??
 	var/obj/item/radio/Radio
 	var/emergency //If an emergency has been called by this device. Acts as both a cooldown and lets the responder know where it the emergency was triggered from
 	var/receive_ore_updates = FALSE //If ore redemption machines will send an update when it receives new ores.
@@ -62,16 +62,17 @@ GLOBAL_LIST_EMPTY(allConsoles)
 	update_icon()
 
 /obj/machinery/requests_console/update_icon_state()
-	if(stat & NOPOWER)
+	if(CHECK_BITFIELD(stat, NOPOWER))
 		set_light(0)
 	else
-		set_light(1.4,0.7,"#34D352")//green light
+		set_light(1.4, 0.7, "#34D352")//green light
+
 	if(open)
 		if(!hackState)
 			icon_state="req_comp_open"
 		else
 			icon_state="req_comp_rewired"
-	else if(stat & NOPOWER)
+	else if(CHECK_BITFIELD(stat, NOPOWER))
 		if(icon_state != "req_comp_off")
 			icon_state = "req_comp_off"
 	else
@@ -122,7 +123,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
 				GLOB.req_console_information += department
 
 	Radio = new /obj/item/radio(src)
-	Radio.listening = 0
+	Radio.listening = FALSE
 
 /obj/machinery/requests_console/Destroy()
 	QDEL_NULL(Radio)
@@ -131,164 +132,173 @@ GLOBAL_LIST_EMPTY(allConsoles)
 
 /obj/machinery/requests_console/ui_interact(mob/user)
 	. = ..()
+	if(open) //no.
+		return
+
 	var/dat = ""
-	if(!open)
-		switch(screen)
-			if(1)	//req. assistance
-				dat += "Which department do you need assistance from?<BR><BR>"
-				dat += "<table width='100%'>"
-				for(var/dpt in GLOB.req_console_assistance)
-					if (dpt != department)
-						dat += "<tr>"
-						dat += "<td width='55%'>[dpt]</td>"
-						dat += "<td width='45%'><A href='?src=[REF(src)];write=[ckey(dpt)]'>Normal</A> <A href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</A>"
-						if(hackState)
-							dat += "<A href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</A>"
-						dat += "</td>"
-						dat += "</tr>"
-				dat += "</table>"
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Back</A><BR>"
+	switch(screen)
+		if(1)	//req. assistance
+			dat += "Which department do you need assistance from?<br><br>"
+			dat += "<table width='100%'>"
+			for(var/dpt in GLOB.req_console_assistance)
+				if(dpt == department)
+					continue
+				dat += "<tr>"
+				dat += "<td width='55%'>[dpt]</td>"
+				dat += "<td width='45%'>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=1'>Normal</a>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</a>"
+				if(hackState)
+					dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</a>"
+				dat += "</td>"
+				dat += "</tr>"
+			dat += "</table>"
+			dat += "<br><A href='?src=[REF(src)];setScreen=0'><< Back</A><br>"
 
-			if(2)	//req. supplies
-				dat += "Which department do you need supplies from?<BR><BR>"
-				dat += "<table width='100%'>"
-				for(var/dpt in GLOB.req_console_supplies)
-					if (dpt != department)
-						dat += "<tr>"
-						dat += "<td width='55%'>[dpt]</td>"
-						dat += "<td width='45%'><A href='?src=[REF(src)];write=[ckey(dpt)]'>Normal</A> <A href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</A>"
-						if(hackState)
-							dat += "<A href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</A>"
-						dat += "</td>"
-						dat += "</tr>"
-				dat += "</table>"
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Back</A><BR>"
+		if(2)	//req. supplies
+			dat += "Which department do you need supplies from?<br><br>"
+			dat += "<table width='100%'>"
+			for(var/dpt in GLOB.req_console_supplies)
+				if(dpt == department)
+					continue
 
-			if(3)	//relay information
-				dat += "Which department would you like to send information to?<BR><BR>"
-				dat += "<table width='100%'>"
-				for(var/dpt in GLOB.req_console_information)
-					if (dpt != department)
-						dat += "<tr>"
-						dat += "<td width='55%'>[dpt]</td>"
-						dat += "<td width='45%'><A href='?src=[REF(src)];write=[ckey(dpt)]'>Normal</A> <A href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</A>"
-						if(hackState)
-							dat += "<A href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</A>"
-						dat += "</td>"
-						dat += "</tr>"
-				dat += "</table>"
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Back</A><BR>"
+				dat += "<tr>"
+				dat += "<td width='55%'>[dpt]</td>"
+				dat += "<td width='45%'>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=1'>Normal</a>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</a>"
+				if(hackState)
+					dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</a>"
+				dat += "</td>"
+				dat += "</tr>"
+			dat += "</table>"
+			dat += "<br><A href='?src=[REF(src)];setScreen=0'><< Back</A><br>"
 
-			if(6)	//sent successfully
-				dat += "<span class='good'>Message sent.</span><BR><BR>"
-				dat += "<A href='?src=[REF(src)];setScreen=0'>Continue</A><BR>"
+		if(3)	//relay information
+			dat += "Which department would you like to send information to?<br><br>"
+			dat += "<table width='100%'>"
+			for(var/dpt in GLOB.req_console_information)
+				if(dpt == department)
+					continue
+				dat += "<tr>"
+				dat += "<td width='55%'>[dpt]</td>"
+				dat += "<td width='45%'>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=1'>Normal</a>"
+				dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=2'>High</a>"
+				if(hackState)
+					dat += "<a href='?src=[REF(src)];write=[ckey(dpt)];priority=3'>EXTREME</a>"
+				dat += "</td>"
+				dat += "</tr>"
+			dat += "</table>"
+			dat += "<br><a href='?src=[REF(src)];setScreen=0'><< Back</a><br>"
 
-			if(7)	//unsuccessful; not sent
-				dat += "<span class='bad'>An error occurred.</span><BR><BR>"
-				dat += "<A href='?src=[REF(src)];setScreen=0'>Continue</A><BR>"
+		if(6)	//sent successfully
+			dat += "<span class='good'>Message sent.</span><br><br>"
+			dat += "<a href='?src=[REF(src)];setScreen=0'>Continue</a><br>"
 
-			if(8)	//view messages
-				for (var/obj/machinery/requests_console/Console in GLOB.allConsoles)
-					if (Console.department == department)
-						Console.newmessagepriority = NO_NEW_MESSAGE
-						Console.update_icon()
+		if(7)	//unsuccessful; not sent
+			dat += "<span class='bad'>An error occurred.</span><br><br>"
+			dat += "<a href='?src=[REF(src)];setScreen=0'>Continue</a><br>"
 
-				newmessagepriority = NO_NEW_MESSAGE
-				update_icon()
-				var/messageComposite = ""
-				for(var/msg in messages) // This puts more recent messages at the *top*, where they belong.
-					messageComposite = "<div class='block'>[msg]</div>" + messageComposite
-				dat += messageComposite
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Back to Main Menu</A><BR>"
+		if(8)	//view messages
+			for(var/obj/machinery/requests_console/Console in GLOB.allConsoles)
+				if(Console.department == department)
+					Console.newmessagepriority = NO_NEW_MESSAGE
+					Console.update_icon()
 
-			if(9)	//authentication before sending
-				dat += "<B>Message Authentication</B><BR><BR>"
-				dat += "<b>Message for [dpt]: </b>[message]<BR><BR>"
-				dat += "<div class='notice'>You may authenticate your message now by scanning your ID or your stamp</div><BR>"
-				dat += "<b>Validated by:</b> [msgVerified ? msgVerified : "<i>Not Validated</i>"]<br>"
-				dat += "<b>Stamped by:</b> [msgStamped ? msgStamped : "<i>Not Stamped</i>"]<br><br>"
-				dat += "<A href='?src=[REF(src)];department=[dpt]'>Send Message</A><BR>"
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Discard Message</A><BR>"
+			newmessagepriority = NO_NEW_MESSAGE
+			update_icon()
+			var/messageComposite = ""
+			for(var/msg in messages) // This puts more recent messages at the *top*, where they belong.
+				messageComposite = "<div class='block'>[msg]</div>" + messageComposite
+			dat += messageComposite
+			dat += "<br><a href='?src=[REF(src)];setScreen=0'><< Back to Main Menu</a><br>"
 
-			if(10)	//send announcement
-				dat += "<h3>Station-wide Announcement</h3>"
-				if(announceAuth)
-					dat += "<div class='notice'>Authentication accepted</div><BR>"
-				else
-					dat += "<div class='notice'>Swipe your card to authenticate yourself</div><BR>"
-				dat += "<b>Message: </b>[message ? message : "<i>No Message</i>"]<BR>"
-				dat += "<A href='?src=[REF(src)];writeAnnouncement=1'>[message ? "Edit" : "Write"] Message</A><BR><BR>"
-				if ((announceAuth || IsAdminGhost(user)) && message)
-					dat += "<A href='?src=[REF(src)];sendAnnouncement=1'>Announce Message</A><BR>"
-				else
-					dat += "<span class='linkOff'>Announce Message</span><BR>"
-				dat += "<BR><A href='?src=[REF(src)];setScreen=0'><< Back</A><BR>"
+		if(9)	//authentication before sending
+			dat += "<b>Message Authentication</b> <br><br>"
+			dat += "<b>Message for [dpt]:</b> [message] <br><br>"
+			dat += "<div class='notice'>You may authenticate your message now by scanning your ID or your stamp</div> <br>"
+	
+			dat += "<b>Validated by:</b> [msgVerified ? "<span class='good'><b>[msgVerified]</b></span>" : "<i>Not Validated</i>"] <br>"
+			dat += "<b>Stamped by:</b> [msgStamped ? "<span class='boldnotice'>[msgStamped]</span>" : "<i>Not Stamped</i>"] <br><br>"
+	
+			dat += "<a href='?src=[REF(src)];department=[dpt]'>Send Message</a> <br><br>"
+			dat += "<a href='?src=[REF(src)];setScreen=0'><< Discard Message</a> <br>"
 
-			else	//main menu
-				screen = 0
-				announceAuth = FALSE
-				if (newmessagepriority == NORMAL_MESSAGE_PRIORITY)
-					dat += "<div class='notice'>There are new messages</div><BR>"
-				if (newmessagepriority == HIGH_MESSAGE_PRIORITY)
-					dat += "<div class='notice'>There are new <b>PRIORITY</b> messages</div><BR>"
-				if (newmessagepriority == EXTREME_MESSAGE_PRIORITY)
-					dat += "<div class='notice'>There are new <b>EXTREME PRIORITY</b> messages</div><BR>"
-				dat += "<A href='?src=[REF(src)];setScreen=8'>View Messages</A><BR><BR>"
+		if(10)	//send announcement
+			dat += "<h3>Station-wide Announcement</h3>"
+			if(announceAuth)
+				dat += "<div class='notice'>Authentication accepted</div><br>"
+			else
+				dat += "<div class='notice'>Swipe your card to authenticate yourself</div> <br>"
+			dat += "<b>Message: </b>[message ? message : "<i>No Message</i>"] <br>"
+			dat += "<a href='?src=[REF(src)];writeAnnouncement=1'>[message ? "Edit" : "Write"] Message</a> <br><br>"
+			if((announceAuth || IsAdminGhost(user)) && message)
+				dat += "<a href='?src=[REF(src)];sendAnnouncement=1'>Announce Message</a> <br>"
+			else
+				dat += "<span class='linkOff'>Announce Message</span> <br>"
+			dat += "<br><a href='?src=[REF(src)];setScreen=0'><< Back</a> <br>"
 
-				dat += "<A href='?src=[REF(src)];setScreen=1'>Request Assistance</A><BR>"
-				dat += "<A href='?src=[REF(src)];setScreen=2'>Request Supplies</A><BR>"
-				dat += "<A href='?src=[REF(src)];setScreen=3'>Relay Anonymous Information</A><BR><BR>"
+		else	//main menu
+			screen = 0
+			announceAuth = FALSE
+			if(newmessagepriority == NORMAL_MESSAGE_PRIORITY)
+				dat += "<div class='notice'>There are new messages</div><br>"
+			if(newmessagepriority == HIGH_MESSAGE_PRIORITY)
+				dat += "<div class='notice'>There are new <b>PRIORITY</b> messages</div><br>"
+			if(newmessagepriority == EXTREME_MESSAGE_PRIORITY)
+				dat += "<div class='notice'>There are new <b>EXTREME PRIORITY</b> messages</div><br>"
 
-				if(!emergency)
-					dat += "<A href='?src=[REF(src)];emergency=1'>Emergency: Security</A><BR>"
-					dat += "<A href='?src=[REF(src)];emergency=2'>Emergency: Engineering</A><BR>"
-					dat += "<A href='?src=[REF(src)];emergency=3'>Emergency: Medical</A><BR><BR>"
-				else
-					dat += "<B><font color='red'>[emergency] has been dispatched to this location.</font></B><BR><BR>"
+			dat += "<a href='?src=[REF(src)];setScreen=8'>View Messages</a> <br><br>"
 
-				if(announcementConsole)
-					dat += "<A href='?src=[REF(src)];setScreen=10'>Send Station-wide Announcement</A><BR><BR>"
-				if (silent)
-					dat += "Speaker <A href='?src=[REF(src)];setSilent=0'>OFF</A>"
-				else
-					dat += "Speaker <A href='?src=[REF(src)];setSilent=1'>ON</A>"
-		var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440)
-		popup.set_content(dat)
-		popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-		popup.open()
-	return
+			dat += "<a href='?src=[REF(src)];setScreen=1'>Request Assistance</a> <br>"
+			dat += "<a href='?src=[REF(src)];setScreen=2'>Request Supplies</a> <br>"
+			dat += "<a href='?src=[REF(src)];setScreen=3'>Relay Anonymous Information</a> <br><br>"
+
+			if(!emergency)
+				dat += "<a href='?src=[REF(src)];emergency=1'>Emergency: Security</a> <br>"
+				dat += "<a href='?src=[REF(src)];emergency=2'>Emergency: Engineering</a> <br>"
+				dat += "<a href='?src=[REF(src)];emergency=3'>Emergency: Medical</a> <br><br>"
+			else
+				dat += "<b><div class='bad'>[emergency] has been dispatched to this location.</div></b> <br><br>"
+
+			if(announcementConsole)
+				dat += "<a href='?src=[REF(src)];setScreen=10'>Send Station-wide Announcement</a> <br><br>"
+			if(silent)
+				dat += "Speaker <a href='?src=[REF(src)];setSilent=0'>OFF</a>"
+			else
+				dat += "Speaker <a href='?src=[REF(src)];setSilent=1'>ON</a>"
+
+	var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
+	popup.open()
 
 /obj/machinery/requests_console/Topic(href, href_list)
 	if(..())
 		return
 	usr.set_machine(src)
 	add_fingerprint(usr)
-
+	
 	if(href_list["write"])
 		dpt = ckey(reject_bad_text(href_list["write"])) //write contains the string of the receiving department's name
 		var/new_message = stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN)
 		if(new_message)
 			message = new_message
 			screen = 9
-			if (text2num(href_list["priority"]) < 2)
-				priority = -1
-			else
-				priority = text2num(href_list["priority"])
+			priority = text2num(href_list["priority"])
 		else
 			dpt = "";
 			msgVerified = ""
 			msgStamped = ""
 			screen = 0
-			priority = -1
+			priority = NORMAL_MESSAGE_PRIORITY //:salt:
 
 	if(href_list["writeAnnouncement"])
 		var/new_message = reject_bad_text(stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN))
 		if(new_message)
 			message = new_message
-			if (text2num(href_list["priority"]) < 2)
-				priority = -1
-			else
-				priority = text2num(href_list["priority"])
+			priority = text2num(href_list["priority"])
 		else
 			message = ""
 			announceAuth = FALSE
@@ -296,106 +306,116 @@ GLOBAL_LIST_EMPTY(allConsoles)
 
 	if(href_list["sendAnnouncement"])
 		if(!announcementConsole)
+			updateUsrDialog()
 			return
 		if(isliving(usr))
 			var/mob/living/L = usr
 			message = L.treat_message(message)
 		minor_announce(message, "[department] Announcement:")
 		GLOB.news_network.SubmitArticle(message, department, "Station Announcements", null)
-		usr.log_talk(message, LOG_SAY, tag="station announcement from [src]")
+		usr.log_talk(message, LOG_SAY, tag = "station announcement from [src]")
 		message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].")
 		announceAuth = FALSE
 		message = ""
 		screen = 0
 
 	if(href_list["emergency"])
-		if(!emergency)
-			var/radio_freq
-			switch(text2num(href_list["emergency"]))
-				if(1) //Security
-					radio_freq = FREQ_SECURITY
-					emergency = "Security"
-				if(2) //Engineering
-					radio_freq = FREQ_ENGINEERING
-					emergency = "Engineering"
-				if(3) //Medical
-					radio_freq = FREQ_MEDICAL
-					emergency = "Medical"
-			if(radio_freq)
-				Radio.set_frequency(radio_freq)
-				Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq)
-				update_icon()
-				addtimer(CALLBACK(src, .proc/clear_emergency), 3000)
+		if(emergency) //already has an emergency? do not continue
+			updateUsrDialog()
+			return
 
-	if( href_list["department"] && message )
-		var/log_msg = message
+		var/radio_freq
+		switch(text2num(href_list["emergency"]))
+			if(1) //Security
+				radio_freq = FREQ_SECURITY
+				emergency = "Security"
+			if(2) //Engineering
+				radio_freq = FREQ_ENGINEERING
+				emergency = "Engineering"
+			if(3) //Medical
+				radio_freq = FREQ_MEDICAL
+				emergency = "Medical"
+		if(radio_freq)
+			Radio.set_frequency(radio_freq)
+			Radio.talk_into(src, "[emergency] emergency in [department]!!", radio_freq)
+			update_icon()
+			addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES)
+
+	if(href_list["department"] && message)
 		var/sending = message
 		sending += "<br>"
-		if (msgVerified)
-			sending += msgVerified
-			sending += "<br>"
-		if (msgStamped)
-			sending += msgStamped
-			sending += "<br>"
-		screen = 7 //if it's successful, this will get overrwritten (7 = unsufccessfull, 6 = successfull)
-		if (sending)
-			var/pass = FALSE
-			var/datum/data_rc_msg/log = new(href_list["department"], department, log_msg, msgStamped, msgVerified, priority)
-			for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list)
-				if (MS.toggled)
-					MS.rc_msgs += log
-					pass = TRUE
+		if(msgVerified)
+			sending += "<span class='good'><b>[msgVerified]</b></span> <br>"
+		if(msgStamped)
+			sending += "<span class='boldnotice'>[msgStamped]</span> <br>"
+		//so you're telling me is you cheated, by making fail happen, then quickly replacing it with 6
 
-			if(pass)
-				var/radio_freq = 0
-				switch(href_list["department"])
-					if("bridge")
-						radio_freq = FREQ_COMMAND
-					if("medbay")
-						radio_freq = FREQ_MEDICAL
-					if("science")
-						radio_freq = FREQ_SCIENCE
-					if("engineering")
-						radio_freq = FREQ_ENGINEERING
-					if("security")
-						radio_freq = FREQ_SECURITY
-					if("cargobay" || "mining")
-						radio_freq = FREQ_SUPPLY
-				Radio.set_frequency(radio_freq)
-				var/authentic
-				if(msgVerified || msgStamped)
-					authentic = " (Authenticated)"
+		var/workingServer = FALSE
+		var/datum/data_rc_msg/log = new(href_list["department"], department, message, msgStamped, msgVerified, priority)
+		for(var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list)
+			if(MS.on) //on does the calculations. why would this server still work even though the apc is off??
+				LAZYADD(MS.rc_msgs, log)
+				workingServer = TRUE
 
-				var/alert = ""
-				for (var/obj/machinery/requests_console/Console in GLOB.allConsoles)
-					if (ckey(Console.department) == ckey(href_list["department"]))
-						switch(priority)
-							if(2)		//High priority
-								alert = "PRIORITY Alert in [department][authentic]"
-								Console.createmessage(src, alert, sending, 2, 1)
-							if(3)		// Extreme Priority
-								alert = "EXTREME PRIORITY Alert from [department][authentic]"
-								Console.createmessage(src, alert , sending, 3, 1)
-							else		// Normal priority
-								alert = "Message from [department][authentic]"
-								Console.createmessage(src, alert , sending, 1, 1)
-						screen = 6
+		if(!workingServer)
+			screen = 7 
+			say("NOTICE: No server detected! Please contact your local engineering team.")
+			updateUsrDialog()
+			return
 
-				if(radio_freq)
-					Radio.talk_into(src, "[alert]: <i>[message]</i>", radio_freq)
+		var/radio_freq = 0
+		switch(href_list["department"])
+			if("bridge")
+				radio_freq = FREQ_COMMAND
+			if("medbay")
+				radio_freq = FREQ_MEDICAL
+			if("science")
+				radio_freq = FREQ_SCIENCE
+			if("engineering")
+				radio_freq = FREQ_ENGINEERING
+			if("security")
+				radio_freq = FREQ_SECURITY
+			if("cargobay" || "mining")
+				radio_freq = FREQ_SUPPLY
+		Radio.set_frequency(radio_freq)
 
-				switch(priority)
-					if(2)
-						messages += "<span class='bad'>High Priority</span><BR><b>To:</b> [dpt]<BR>[sending]"
-					else
-						messages += "<b>To: [dpt]</b><BR>[sending]"
+		var/authentic = ""
+		if(msgVerified || msgStamped)
+			authentic = " (Authenticated)"
+
+		var/alert = ""
+		for(var/obj/machinery/requests_console/C in GLOB.allConsoles)
+			if(ckey(C.department) != ckey(href_list["department"]))
+				continue
+			switch(priority)
+				if(HIGH_MESSAGE_PRIORITY)		//High priority
+					alert = "PRIORITY Alert from [department][authentic]"
+					C.createmessage(src, alert, sending, HIGH_MESSAGE_PRIORITY)
+				if(EXTREME_MESSAGE_PRIORITY)	// Extreme Priority
+					alert = "EXTREME PRIORITY Alert from [department][authentic]"
+					C.createmessage(src, alert, sending, EXTREME_MESSAGE_PRIORITY)
+				else		// Normal priority
+					alert = "Message from [department][authentic]"
+					C.createmessage(src, alert, sending, NORMAL_MESSAGE_PRIORITY)
+			screen = 6 //if it ever gets here that means (c.department == href_ls["dept"])
+
+		if(radio_freq)
+			Radio.talk_into(src, "[alert]: <i>[message]</i>", radio_freq)
+		//log to (this)
+		switch(priority)
+			if(HIGH_MESSAGE_PRIORITY)
+				messages += "<span class='bad'>High Priority</span><br><b>To:</b> [dpt]<br>[sending]"
+			if(EXTREME_MESSAGE_PRIORITY)
+				messages += "<span class='bad'>!!!Extreme Priority!!!</span><br><b>To:</b> [dpt]<br>[sending]"
 			else
-				say("NOTICE: No server detected!")
+				messages += "<b>To:</b> [dpt]<br>[sending]"
 
 
 	//Handle screen switching
 	switch(text2num(href_list["setScreen"]))
 		if(null)	//skip
+			updateUsrDialog()
+			return
 		if(1)		//req. assistance
 			screen = 1
 		if(2)		//req. supplies
@@ -423,16 +443,14 @@ GLOBAL_LIST_EMPTY(allConsoles)
 			msgVerified = ""
 			msgStamped = ""
 			message = ""
-			priority = -1
+			priority = NORMAL_MESSAGE_PRIORITY // :salt:
 			screen = 0
 
 	//Handle silencing the console
-	switch( href_list["setSilent"] )
-		if(null)	//skip
-		if("1")
-			silent = TRUE
-		else
-			silent = FALSE
+	if(href_list["setSilent"] == "1")
+		silent = TRUE
+	else
+		silent = FALSE
 
 	updateUsrDialog()
 	return
@@ -457,31 +475,32 @@ GLOBAL_LIST_EMPTY(allConsoles)
 		linkedsender = source
 	capitalize(title)
 	switch(priority)
-		if(2)		//High priority
+		if(HIGH_MESSAGE_PRIORITY)		//High priority
 			if(newmessagepriority < HIGH_MESSAGE_PRIORITY)
 				newmessagepriority = HIGH_MESSAGE_PRIORITY
 				update_icon()
 			if(!silent)
 				playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
 				say(title)
-				messages += "<span class='bad'>High Priority</span><BR><b>From:</b> [linkedsender]<BR>[message]"
+			messages += "<span class='bad'>High Priority</span><br><b>From:</b> [linkedsender]<br>[message]" //the fuck is this not being sent
 
-		if(3)		// Extreme Priority
+		if(EXTREME_MESSAGE_PRIORITY)		// Extreme Priority
 			if(newmessagepriority < EXTREME_MESSAGE_PRIORITY)
 				newmessagepriority = EXTREME_MESSAGE_PRIORITY
 				update_icon()
-				playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
-				say(title)
-			messages += "<span class='bad'>!!!Extreme Priority!!!</span><BR><b>From:</b> [linkedsender]<BR>[message]"
+			//we ignore the silent option because this is !!!IMPORTANT!!!
+			playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
+			say(title)
+			messages += "<span class='bad'><b>!!!Extreme Priority!!!</span></b><br><b>From:</b> [linkedsender]<br>[message]"
 
 		else		// Normal priority
 			if(newmessagepriority < NORMAL_MESSAGE_PRIORITY)
 				newmessagepriority = NORMAL_MESSAGE_PRIORITY
 				update_icon()
-			if(!src.silent)
+			if(!silent)
 				playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
 				say(title)
-			messages += "<b>From:</b> [linkedsender]<BR>[message]"
+			messages += "<b>From:</b> [linkedsender]<br>[message]"
 
 /obj/machinery/requests_console/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/crowbar))
@@ -505,23 +524,26 @@ GLOBAL_LIST_EMPTY(allConsoles)
 			to_chat(user, "<span class='warning'>You must open the maintenance panel first!</span>")
 		return
 
-	var/obj/item/card/id/ID = O.GetID()
-	if(ID)
+	if(istype(O, /obj/item/card/id))
+		var/obj/item/card/id/ID = O.GetID()
+		if(!ID)
+			return
 		if(screen == 9)
-			msgVerified = "<font color='green'><b>Verified by [ID.registered_name] ([ID.assignment])</b></font>"
+			msgVerified = "Verified by [ID.registered_name] ([ID.assignment])"
 			updateUsrDialog()
 		if(screen == 10)
-			if (ACCESS_RC_ANNOUNCE in ID.access)
+			if(ACCESS_RC_ANNOUNCE in ID.access)
 				announceAuth = TRUE
 			else
 				announceAuth = FALSE
 				to_chat(user, "<span class='warning'>You are not authorized to send announcements!</span>")
 			updateUsrDialog()
 		return
-	if (istype(O, /obj/item/stamp))
+	
+	if(istype(O, /obj/item/stamp))
 		if(screen == 9)
 			var/obj/item/stamp/T = O
-			msgStamped = "<span class='boldnotice'>Stamped with the [T.name]</span>"
+			msgStamped = "Stamped with the [T.name]"
 			updateUsrDialog()
 		return
 	return ..()

code/game/machinery/telecomms/computers/logbrowser.dm

@@ -1,215 +1,164 @@
-
+/*
+	The log console for viewing the entire telecomms 
+	network log
+*/
 
 /obj/machinery/computer/telecomms/server
 	name = "telecommunications server monitoring console"
 	icon_screen = "comm_logs"
 	desc = "Has full access to all details and record of the telecommunications network it's monitoring."
+	circuit = /obj/item/circuitboard/computer/comm_server
+	req_access = list(ACCESS_TCOMSAT)
 
-	var/screen = 0				// the screen number:
-	var/list/servers = list()	// the servers located by the computer
-	var/obj/machinery/telecomms/server/SelectedServer
+	var/list/machinelist = list()	// the servers located by the computer
+	var/obj/machinery/telecomms/server/SelectedMachine = null
 
 	var/network = "NULL"		// the network to probe
-	var/temp = ""				// temporary feedback messages
+	var/notice = ""
+	var/universal_translate = FALSE // set to TRUE(1) if it can translate nonhuman speech	
 
-	var/universal_translate = 0 // set to 1 if it can translate nonhuman speech
+/obj/machinery/computer/telecomms/server/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "tcommsserver", "Telecomms Server Monitor", 575, 400, master_ui, state)
+		ui.open()
 
-	req_access = list(ACCESS_TCOMSAT)
-	circuit = /obj/item/circuitboard/computer/comm_server
+/obj/machinery/computer/telecomms/server/ui_data(mob/user)
+	var/list/data_out = list()
+	data_out["network"] = network
+	data_out["notice"] = notice
 
-/obj/machinery/computer/telecomms/server/ui_interact(mob/user)
-	. = ..()
-	var/dat = "<TITLE>Telecommunication Server Monitor</TITLE><center><b>Telecommunications Server Monitor</b></center>"
+	data_out["servers"] = list()
+	for(var/obj/machinery/telecomms/server/T in machinelist)
+		var/list/data = list(
+			name = T.name,
+			id = T.id,
+			ref = REF(T)
+		)
+		data_out["servers"] += list(data)
+	data_out["servers"] = sortList(data_out["servers"]) //a-z sort
 
-	switch(screen)
+	if(!SelectedMachine) //null is bad.
+		data_out["selected"] = null //but in js, null is good.
+		return data_out
 
+	data_out["selected"] = list(
+		name = SelectedMachine.name,
+		id = SelectedMachine.id,
+		status = SelectedMachine.on,
+		traffic = SelectedMachine.totaltraffic, //note: total traffic, not traffic!
+		ref = REF(SelectedMachine)
+	)
+	data_out["selected_logs"] = list()
 
-	  // --- Main Menu ---
+	if(!LAZYLEN(SelectedMachine.log_entries))
+		return data_out
+	
+	for(var/datum/comm_log_entry/C in SelectedMachine.log_entries)
+		var/list/data = list()
+		data["name"] = C.name	//name of the file
+		data["ref"] = REF(C)
+		data["input_type"] = C.input_type	//type of input ("Speech File" | "Execution Error").
 
-		if(0)
-			dat += "<br>[temp]<br>"
-			dat += "<br>Current Network: <a href='?src=[REF(src)];network=1'>[network]</a><br>"
-			if(servers.len)
-				dat += "<br>Detected Telecommunication Servers:<ul>"
-				for(var/obj/machinery/telecomms/T in servers)
-					dat += "<li><a href='?src=[REF(src)];viewserver=[T.id]'>[REF(T)] [T.name]</a> ([T.id])</li>"
-				dat += "</ul>"
-				dat += "<br><a href='?src=[REF(src)];operation=release'>\[Flush Buffer\]</a>"
+		if(C.input_type == "Speech File") //there is a reason why this is not a switch.
+			data["source"] = list(
+				name = C.parameters["name"],	//name of the mob | obj
+				job = C.parameters["job"]		//job of the mob | obj
+			)
 
+			// -- Determine race of orator --
+			var/mobtype = C.parameters["mobtype"]
+			var/race	// The actual race of the mob
+
+			if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain))
+				race = "Humanoid"
+			else if(ispath(mobtype, /mob/living/simple_animal/slime))
+				race = "Slime"	// NT knows a lot about slimes, but not aliens. Can identify slimes
+			else if(ispath(mobtype, /mob/living/carbon/monkey))
+				race = "Monkey"
+			else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI")
+				race = "Artificial Life"	// sometimes M gets deleted prematurely for AIs... just check the job
+			else if(isobj(mobtype))
+				race = "Machinery"
+			else if(ispath(mobtype, /mob/living/simple_animal))
+				race = "Domestic Animal"
 			else
-				dat += "<br>No servers detected. Scan for servers: <a href='?src=[REF(src)];operation=scan'>\[Scan\]</a>"
+				race = "Unidentifiable"
 
+			data["race"] = race
+			// based on [/atom/movable/proc/lang_treat]
+			var/message = C.parameters["message"]
+			var/language = C.parameters["language"]
 
-	  // --- Viewing Server ---
+			if(universal_translate || user.has_language(language))
+				message = message
+			else if(!user.has_language(language))
+				var/datum/language/D = GLOB.language_datum_instances[language]
+				message = D.scramble(message)
+			else if(language)
+				message = "(unintelligible)"
 
-		if(1)
-			dat += "<br>[temp]<br>"
-			dat += "<center><a href='?src=[REF(src)];operation=mainmenu'>\[Main Menu\]</a>     <a href='?src=[REF(src)];operation=refresh'>\[Refresh\]</a></center>"
-			dat += "<br>Current Network: [network]"
-			dat += "<br>Selected Server: [SelectedServer.id]"
+			data["message"] = message
 
-			if(SelectedServer.totaltraffic >= 1024)
-				dat += "<br>Total recorded traffic: [round(SelectedServer.totaltraffic / 1024)] Terrabytes<br><br>"
-			else
-				dat += "<br>Total recorded traffic: [SelectedServer.totaltraffic] Gigabytes<br><br>"
+		else if(C.input_type == "Execution Error")
+			data["message"] = C.parameters["message"]
+		else
+			data["message"] = "(unintelligible)"
+		
+		data_out["selected_logs"] += list(data)
+	return data_out
 
-			dat += "Stored Logs: <ol>"
-
-			var/i = 0
-			for(var/datum/comm_log_entry/C in SelectedServer.log_entries)
-				i++
-
-
-				// If the log is a speech file
-				if(C.input_type == "Speech File")
-					dat += "<li><font color = #008F00>[C.name]</font>  <font color = #FF0000><a href='?src=[REF(src)];delete=[i]'>\[X\]</a></font><br>"
-
-					// -- Determine race of orator --
-
-					var/mobtype = C.parameters["mobtype"]
-					var/race			   // The actual race of the mob
-
-					if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain))
-						race = "Humanoid"
-
-					// NT knows a lot about slimes, but not aliens. Can identify slimes
-					else if(ispath(mobtype, /mob/living/simple_animal/slime))
-						race = "Slime"
-
-					else if(ispath(mobtype, /mob/living/carbon/monkey))
-						race = "Monkey"
-
-					// sometimes M gets deleted prematurely for AIs... just check the job
-					else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI")
-						race = "Artificial Life"
-
-					else if(isobj(mobtype))
-						race = "Machinery"
-
-					else if(ispath(mobtype, /mob/living/simple_animal))
-						race = "Domestic Animal"
-
-					else
-						race = "<i>Unidentifiable</i>"
-
-					dat += "<u><font color = #18743E>Data type</font></u>: [C.input_type]<br>"
-					dat += "<u><font color = #18743E>Source</font></u>: [C.parameters["name"]] (Job: [C.parameters["job"]])<br>"
-					dat += "<u><font color = #18743E>Class</font></u>: [race]<br>"
-					var/message = C.parameters["message"]
-					var/language = C.parameters["language"]
-
-					// based on [/atom/movable/proc/lang_treat]
-					if (universal_translate || user.has_language(language))
-						message = "\"[message]\""
-					else if (!user.has_language(language))
-						var/datum/language/D = GLOB.language_datum_instances[language]
-						message = "\"[D.scramble(message)]\""
-					else if (language)
-						message = "<i>(unintelligible)</i>"
-
-					dat += "<u><font color = #18743E>Contents</font></u>: [message]<br>"
-					dat += "</li><br>"
-
-				else if(C.input_type == "Execution Error")
-					dat += "<li><font color = #990000>[C.name]</font>  <a href='?src=[REF(src)];delete=[i]'>\[X\]</a><br>"
-					dat += "<u><font color = #787700>Error</font></u>: \"[C.parameters["message"]]\"<br>"
-					dat += "</li><br>"
-
-				else
-					dat += "<li><font color = #000099>[C.name]</font>  <a href='?src=[REF(src)];delete=[i]'>\[X\]</a><br>"
-					dat += "<u><font color = #18743E>Data type</font></u>: [C.input_type]<br>"
-					dat += "<u><font color = #18743E>Contents</font></u>: <i>(unintelligible)</i><br>"
-					dat += "</li><br>"
-
-
-			dat += "</ol>"
-
-
-
-	user << browse(dat, "window=comm_monitor;size=575x400")
-	onclose(user, "server_control")
-
-	temp = ""
-	return
-
-
-/obj/machinery/computer/telecomms/server/Topic(href, href_list)
+/obj/machinery/computer/telecomms/server/ui_act(action, params)
 	if(..())
 		return
-
-
-	add_fingerprint(usr)
-	usr.set_machine(src)
-
-	if(href_list["viewserver"])
-		screen = 1
-		for(var/obj/machinery/telecomms/T in servers)
-			if(T.id == href_list["viewserver"])
-				SelectedServer = T
-				break
-
-	if(href_list["operation"])
-		switch(href_list["operation"])
-
-			if("release")
-				servers = list()
-				screen = 0
-
-			if("mainmenu")
-				screen = 0
-
-			if("scan")
-				if(servers.len > 0)
-					temp = "<font color = #D70B00>- FAILED: CANNOT PROBE WHEN BUFFER FULL -</font color>"
-
-				else
-					for(var/obj/machinery/telecomms/server/T in urange(25, src))
-						if(T.network == network)
-							servers.Add(T)
-
-					if(!servers.len)
-						temp = "<font color = #D70B00>- FAILED: UNABLE TO LOCATE SERVERS IN \[[network]\] -</font color>"
-					else
-						temp = "<font color = #336699>- [servers.len] SERVERS PROBED & BUFFERED -</font color>"
-
-					screen = 0
-
-	if(href_list["delete"])
-
-		if(!src.allowed(usr) && !(obj_flags & EMAGGED))
-			to_chat(usr, "<span class='danger'>ACCESS DENIED.</span>")
+	switch(action)
+		if("mainmenu")
+			SelectedMachine = null
+			notice = ""
 			return
+		if("release")
+			machinelist = list()
+			notice = ""
+			return
+		if("network") //network change, flush the selected machine and buffer
+			var/newnet = sanitize(sanitize_text(params["value"], network))
+			if(length(newnet) > 15)	//i'm looking at you, you href fuckers
+				notice = "FAILED: Network tag string too lengthy"
+				return
+			network = newnet
+			SelectedMachine = null
+			machinelist = list()
+			return
+		if("probe")
+			if(LAZYLEN(machinelist) > 0)
+				notice = "FAILED: Cannot probe when buffer full"
+				return
+			
+			for(var/obj/machinery/telecomms/T in GLOB.telecomms_list) //telecomms just went global!
+				if(T.network == network)
+					LAZYADD(machinelist, T)
 
-		if(SelectedServer)
+			if(!LAZYLEN(machinelist))
+				notice = "FAILED: Unable to locate network entities in \[[network]\]"
+				return
+		if("viewmachine")
+			for(var/obj/machinery/telecomms/T in machinelist)
+				if(T.id == params["value"])
+					SelectedMachine = T
+					break
+		if("delete")
+			if(!src.allowed(usr) && !CHECK_BITFIELD(obj_flags, EMAGGED))
+				to_chat(usr, "<span class='danger'>ACCESS DENIED.</span>")
+				return
 
-			var/datum/comm_log_entry/D = SelectedServer.log_entries[text2num(href_list["delete"])]
-
-			temp = "<font color = #336699>- DELETED ENTRY: [D.name] -</font color>"
-
-			SelectedServer.log_entries.Remove(D)
+			if(!SelectedMachine)
+				notice = "ALERT: No server detected. Server may be nonresponsive."
+				return
+			var/datum/comm_log_entry/D = locate(params["value"])
+			if(!istype(D))
+				notice = "NOTICE: Object not found"		
+				return
+			notice = "Deleted entry: [D.name]"
+			LAZYREMOVE(SelectedMachine.log_entries, D)
 			qdel(D)
-
-		else
-			temp = "<font color = #D70B00>- FAILED: NO SELECTED MACHINE -</font color>"
-
-	if(href_list["network"])
-
-		var/newnet = stripped_input(usr, "Which network do you want to view?", "Comm Monitor", network)
-
-		if(newnet && ((usr in range(1, src)) || hasSiliconAccessInArea(usr)))
-			if(length(newnet) > 15)
-				temp = "<font color = #D70B00>- FAILED: NETWORK TAG STRING TOO LENGHTLY -</font color>"
-
-			else
-
-				network = newnet
-				screen = 0
-				servers = list()
-				temp = "<font color = #336699>- NEW NETWORK TAG SET IN ADDRESS \[[network]\] -</font color>"
-
-	updateUsrDialog()
-	return
-
-/obj/machinery/computer/telecomms/server/attackby()
-	. = ..()
-	updateUsrDialog()

code/game/machinery/telecomms/computers/message.dm

@@ -3,241 +3,360 @@
 	Lets you read PDA and request console messages.
 */
 
-#define LINKED_SERVER_NONRESPONSIVE  (!linkedServer || (linkedServer.stat & (NOPOWER|BROKEN)))
-
 // The monitor itself.
 /obj/machinery/computer/message_monitor
 	name = "message monitor console"
 	desc = "Used to monitor the crew's PDA messages, as well as request console messages."
 	icon_screen = "comm_logs"
 	circuit = /obj/item/circuitboard/computer/message_monitor
-	//Server linked to.
+
+	//Servers, and server linked to.
+	var/network = "tcommsat"		// the network to probe
+	var/list/machinelist = list()	// the servers located by the computer
 	var/obj/machinery/telecomms/message_server/linkedServer = null
+
 	//Sparks effect - For emag
 	var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
+
 	//Messages - Saves me time if I want to change something.
-	var/noserver = "<span class='alert'>ALERT: No server detected.</span>"
-	var/incorrectkey = "<span class='warning'>ALERT: Incorrect decryption key!</span>"
-	var/defaultmsg = "<span class='notice'>Welcome. Please select an option.</span>"
-	var/rebootmsg = "<span class='warning'>%$&(�: Critical %$$@ Error // !RestArting! <lOadiNg backUp iNput ouTput> - ?pLeaSe wAit!</span>"
+	var/noserver = "ALERT: No server detected. Server may be nonresponsive."
+	var/incorrectkey = "ALERT: Incorrect decryption key!"
+	var/rebootmsg = "%$�(�:SYS&EM INTRN@L ACfES VIOL�TIa█ DEtE₡TED! Ree3ARcinG A█ BAaKUP RdST�RE PbINT \[0xcff32ca/ - PLfASE aAIT"
+
 	//Computer properties
-	var/screen = 0 		// 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message
 	var/hacking = FALSE		// Is it being hacked into by the AI/Cyborg
-	var/message = "<span class='notice'>System bootup complete. Please select an option.</span>"	// The message that shows on the main menu.
-	var/auth = FALSE // Are they authenticated?
-	var/optioncount = 7
+	var/message = ""		// The message that shows on the main menu.
+	var/auth = FALSE 		// Are they authenticated?
+
 	// Custom Message Properties
-	var/customsender = "System Administrator"
 	var/obj/item/pda/customrecepient = null
+	var/customsender = "System Administrator"
 	var/customjob		= "Admin"
 	var/custommessage 	= "This is a test, please ignore."
 
 	light_color = LIGHT_COLOR_GREEN
 
+/obj/machinery/computer/message_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE,\
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+
+	if(!ui)
+		ui = new(user, src, ui_key, "telepdalog", name, 727, 510, master_ui, state)
+		ui.open()
+
+/obj/machinery/computer/message_monitor/ui_static_data(mob/user)
+	var/list/data_out = list()
+
+	if(!linkedServer || !auth) // no need building this if the usr isn't authenticated
+		return data_out
+
+	data_out["recon_logs"] = list()
+	var/i1 = 0
+	for(var/datum/data_rc_msg/rc in linkedServer.rc_msgs)
+		i1++
+		if(i1 > 3000)
+			break
+		var/list/data = list(
+			sender = rc.send_dpt,
+			recipient = rc.rec_dpt,
+			message = rc.message,
+			stamp = rc.stamp,
+			auth = rc.id_auth,
+			priority = rc.priority,
+			ref = REF(rc)
+		)
+		data_out["recon_logs"] += list(data)
+
+	data_out["message_logs"] = list()
+	var/i2 = 0
+	for(var/datum/data_pda_msg/pda in linkedServer.pda_msgs)
+		i2++
+		if(i2 > 3000)
+			break
+		var/list/data = list(
+			sender = pda.sender,
+			recipient = pda.recipient,
+			message = pda.message,
+			picture = pda.picture ? TRUE : FALSE,
+			ref = REF(pda)
+		)
+		data_out["message_logs"] += list(data)
+	
+	return data_out
+
+/obj/machinery/computer/message_monitor/ui_data(mob/user)
+	var/list/data_out = list()
+
+	data_out["notice"] = message
+	data_out["authenticated"] = auth
+	data_out["network"] = network
+
+	var/mob/living/silicon/S = user
+	if(istype(S) && S.hack_software)
+		data_out["canhack"] = TRUE
+
+	data_out["hacking"] = (hacking || CHECK_BITFIELD(obj_flags, EMAGGED))
+	if(hacking)
+		data_out["borg"] = ((isAI(user) || iscyborg(user)) && !CHECK_BITFIELD(obj_flags, EMAGGED)) //even borgs can't read emag
+		return data_out
+
+	data_out["servers"] = list()
+	for(var/obj/machinery/telecomms/message_server/T in machinelist)
+		var/list/data = list(
+			name = T.name,
+			id = T.id,
+			ref = REF(T)
+		)
+		data_out["servers"] += list(data)	// This /might/ cause an oom. Too bad!
+	data_out["servers"] = sortList(data_out["servers"]) //a-z sort
+
+	data_out["fake_message"] = list(
+		sender = customsender,
+		job = customjob,
+		message = custommessage,
+		recepient = (customrecepient ? "[customrecepient.owner] ([customrecepient.ownjob])" : null)
+	)
+
+	if(!linkedServer)
+		data_out["selected"] = null
+		return data_out
+		
+	data_out["selected"] = list(
+		name = linkedServer.name,
+		id = linkedServer.id,
+		ref = REF(linkedServer),
+		status = (linkedServer.on && (linkedServer.toggled != FALSE)) // returns true if server is running
+	)
+	return data_out
+
+/obj/machinery/computer/message_monitor/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("mainmenu") //deselect
+			linkedServer = null
+			auth = FALSE
+			message = ""
+			return
+		if("release") //release server listing
+			machinelist = list()
+			message = ""
+			return
+		if("network") //network change, flush the selected machine and buffer, and de-auth them, if blank, return default
+			var/newnet = sanitize(sanitize_text(params["value"], network))
+			if(length(newnet) > 15)	//i'm looking at you, you href fuckers
+				message = "FAILED: Network tag string too lengthy"
+				return
+			network = newnet
+			linkedServer = null
+			machinelist = list()
+			auth = FALSE
+			message  = "NOTICE: Network change detected. Server disconnected, please re-authenticate."
+			return
+		if("probe") //probe network for the pda serbs
+			if(LAZYLEN(machinelist) > 0)
+				message = "FAILED: Cannot probe when buffer full"
+				return
+			
+			for(var/obj/machinery/telecomms/message_server/T in GLOB.telecomms_list)
+				if(T.network == network)
+					LAZYADD(machinelist, T)
+
+			if(!LAZYLEN(machinelist))
+				message = "FAILED: Unable to locate network entities in \[[network]\]"
+				return
+		if("viewmachine")	//selected but not authorized
+			for(var/obj/machinery/telecomms/message_server/T in machinelist)
+				if(T.id == params["value"])
+					linkedServer = T
+					break
+
+		if("auth")
+			if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+			if(auth)
+				auth = FALSE
+				update_static_data(usr) //make sure it's cleared!
+				return
+			var/dkey = stripped_input(usr, "Please enter the decryption key.")
+			if(dkey && dkey == "")
+				return
+			if(linkedServer.decryptkey == dkey)
+				auth = TRUE
+			else
+				message = incorrectkey
+			update_static_data(usr)
+		if("change_auth")
+			if(!auth)
+				message = "WARNING: Auth failed! Please log in to change the password!"
+				return
+			else if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+
+			var/dkey = stripped_input(usr, "Please enter the old decryption key.")
+			if(dkey && dkey != "")
+				if(linkedServer.decryptkey == dkey)
+					var/newkey = stripped_input(usr, "Please enter the new key (3 - 20 characters max):")
+					if(!ISINRANGE(length(newkey), 3, 20))
+						message = "NOTICE: Decryption key length too long/short!"
+						return
+					if(newkey && newkey != "")
+						linkedServer.decryptkey = newkey
+						message = "NOTICE: Decryption key set."
+					return
+			message = incorrectkey
+			
+		if("hack")
+			if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+
+			var/mob/living/silicon/S = usr
+			if(istype(S) && S.hack_software)
+				hacking = TRUE
+				//Time it takes to bruteforce is dependant on the password length.
+				addtimer(CALLBACK(src, .proc/BruteForce, usr), (10 SECONDS) * length(linkedServer.decryptkey))
+
+		if("del_log")
+			if(!auth)
+				message = "WARNING: Auth failed! Delete aborted!"
+				return
+			else if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+			
+			var/datum/data_ref = locate(params["ref"])
+			if(istype(data_ref, /datum/data_rc_msg))
+				LAZYREMOVE(linkedServer.rc_msgs, data_ref)
+				message = "NOTICE: Log Deleted!"
+			else if(istype(data_ref, /datum/data_pda_msg))
+				LAZYREMOVE(linkedServer.pda_msgs, data_ref)
+				message = "NOTICE: Log Deleted!"
+			else
+				message = "NOTICE: Log not found! It may have already been deleted"
+			update_static_data(usr)
+
+		if("clear_log")
+			if(!auth)
+				message = "WARNING: Auth failed! Delete aborted!"
+				return
+			else if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+
+			var/what = params["value"]
+			if(what == "pda_logs")
+				linkedServer.pda_msgs = list()
+			if(what == "rc_msgs")
+				linkedServer.rc_msgs = list()
+			update_static_data(usr)
+		if("fake")
+			if(!auth)
+				message = "WARNING: Auth failed!"
+				return
+			else if(!(linkedServer.on && (linkedServer.toggled != FALSE)))
+				message = noserver
+				return
+	
+			if("reset" in params)
+				ResetMessage()
+				return
+			if("send" in params)
+				if(isnull(customrecepient))
+					message = "NOTICE: No recepient selected!"
+					return
+				if(length(custommessage) <= 0 || custommessage == "")
+					message = "NOTICE: No message entered!"
+					return
+				if(length(customjob) <= 0 || customjob == "")
+					customjob = "Admin"
+					return
+				if(length(customsender) <= 0 || customsender == "")
+					customsender = "UNKNOWN"
+				//sanitize text!!!
+				var/datum/signal/subspace/pda/signal = new(src, list(
+					"name" = sanitize(customsender),
+					"job" = sanitize(customjob),
+					"message" = sanitize(custommessage),
+					"emojis" = TRUE,
+					"targets" = list("[customrecepient.owner] ([customrecepient.ownjob])")
+				))
+				// this will log the signal and transmit it to the target
+				linkedServer.receive_information(signal, null)
+				usr.log_message("(PDA: [name] | [usr.real_name]) sent \"[sanitize(custommessage)]\" to [signal.format_target()]", LOG_PDA)
+				message = ""
+				return
+			// Do not check if it's blank yet
+			// But do check if it's above our set limit (for people who manualy send hrefs at us!)
+			if("sender" in params)
+				var/S = params["sender"]
+				if(length(S) > MAX_NAME_LEN)
+					message = "FAILED: Job string too lengthy"
+					return
+				customsender = S
+				return
+			if("job" in params)
+				var/J = params["job"]
+				if(length(J) > 100)
+					message = "FAILED: Job string too lengthy"
+					return
+
+				customjob = J
+				return
+			if("message" in params)
+				var/M = params["message"]
+				if(length(M) > MAX_MESSAGE_LEN)
+					message = "FAILED: Message string too lengthy"
+					return
+				custommessage = M
+				return
+			
+			if("recepient" in params)
+				// Get out list of viable PDAs
+				var/list/obj/item/pda/sendPDAs = get_viewable_pdas()
+				if(GLOB.PDAs && LAZYLEN(GLOB.PDAs) > 0)
+					customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortNames(sendPDAs)
+				else
+					customrecepient = null
+				return
+		if("refresh")
+			update_static_data(usr)
+
 /obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params)
-	if(istype(O, /obj/item/screwdriver) && (obj_flags & EMAGGED))
-		//Stops people from just unscrewing the monitor and putting it back to get the console working again.
+	if(istype(O, /obj/item/screwdriver) && CHECK_BITFIELD(obj_flags, EMAGGED))
+		//Stops people from just unscrewing the monitor and putting it back to get the console working again. 
+		//Why this though, you should make it emag to a board level. (i wont do it)
 		to_chat(user, "<span class='warning'>It is too hot to mess with!</span>")
 	else
 		return ..()
 
 /obj/machinery/computer/message_monitor/emag_act(mob/user)
 	. = ..()
-	if(obj_flags & EMAGGED)
+	if(CHECK_BITFIELD(obj_flags, EMAGGED))
 		return
 	if(isnull(linkedServer))
 		to_chat(user, "<span class='notice'>A no server error appears on the screen.</span>")
 		return
-	obj_flags |= EMAGGED
-	screen = 2
+	ENABLE_BITFIELD(obj_flags, EMAGGED)
 	spark_system.set_up(5, 0, src)
 	spark_system.start()
 	var/obj/item/paper/monitorkey/MK = new(loc, linkedServer)
 	// Will help make emagging the console not so easy to get away with.
 	MK.info += "<br><br><font color='red'>�%@%(*$%&(�&?*(%&�/{}</font>"
-	var/time = 100 * length(linkedServer.decryptkey)
-	addtimer(CALLBACK(src, .proc/UnmagConsole), time)
-	message = rebootmsg
+	addtimer(CALLBACK(src, .proc/UnmagConsole), (10 SECONDS) * length(linkedServer.decryptkey))
+	//message = rebootmsg
 	return TRUE
 
 /obj/machinery/computer/message_monitor/New()
 	. = ..()
 	GLOB.telecomms_list += src
 
-/obj/machinery/computer/message_monitor/Initialize()
-	..()
-	return INITIALIZE_HINT_LATELOAD
-
-/obj/machinery/computer/message_monitor/LateInitialize()
-	//Is the server isn't linked to a server, and there's a server available, default it to the first one in the list.
-	if(!linkedServer)
-		for(var/obj/machinery/telecomms/message_server/S in GLOB.telecomms_list)
-			linkedServer = S
-			break
-
 /obj/machinery/computer/message_monitor/Destroy()
 	GLOB.telecomms_list -= src
 	. = ..()
 
-/obj/machinery/computer/message_monitor/ui_interact(mob/living/user)
-	. = ..()
-	//If the computer is being hacked or is emagged, display the reboot message.
-	if(hacking || (obj_flags & EMAGGED))
-		message = rebootmsg
-	var/dat = "<center><font color='blue'[message]</font></center>"
-
-	if(auth)
-		dat += "<h4><dd><A href='?src=[REF(src)];auth=1'>&#09;<font color='green'>\[Authenticated\]</font></a>&#09;/"
-		dat += " Server Power: <A href='?src=[REF(src)];active=1'>[linkedServer && linkedServer.toggled ? "<font color='green'>\[On\]</font>":"<font color='red'>\[Off\]</font>"]</a></h4>"
-	else
-		dat += "<h4><dd><A href='?src=[REF(src)];auth=1'>&#09;<font color='red'>\[Unauthenticated\]</font></a>&#09;/"
-		dat += " Server Power: <u>[linkedServer && linkedServer.toggled ? "<font color='green'>\[On\]</font>":"<font color='red'>\[Off\]</font>"]</u></h4>"
-
-	if(hacking || (obj_flags & EMAGGED))
-		screen = 2
-	else if(!auth || LINKED_SERVER_NONRESPONSIVE)
-		if(LINKED_SERVER_NONRESPONSIVE)
-			message = noserver
-		screen = 0
-
-	switch(screen)
-		//Main menu
-		if(0)
-			//&#09; = TAB
-			var/i = 0
-			dat += "<dd><A href='?src=[REF(src)];find=1'>&#09;[++i]. Link To A Server</a></dd>"
-			if(auth)
-				if(LINKED_SERVER_NONRESPONSIVE)
-					dat += "<dd><A>&#09;ERROR: Server not found!</A><br></dd>"
-				else
-					dat += "<dd><A href='?src=[REF(src)];view_logs=1'>&#09;[++i]. View Message Logs </a><br></dd>"
-					dat += "<dd><A href='?src=[REF(src)];view_requests=1'>&#09;[++i]. View Request Console Logs </a></br></dd>"
-					dat += "<dd><A href='?src=[REF(src)];clear_logs=1'>&#09;[++i]. Clear Message Logs</a><br></dd>"
-					dat += "<dd><A href='?src=[REF(src)];clear_requests=1'>&#09;[++i]. Clear Request Console Logs</a><br></dd>"
-					dat += "<dd><A href='?src=[REF(src)];pass=1'>&#09;[++i]. Set Custom Key</a><br></dd>"
-					dat += "<dd><A href='?src=[REF(src)];msg=1'>&#09;[++i]. Send Admin Message</a><br></dd>"
-			else
-				for(var/n = ++i; n <= optioncount; n++)
-					dat += "<dd><font color='blue'>&#09;[n]. ---------------</font><br></dd>"
-			var/mob/living/silicon/S = usr
-			if(istype(S) && S.hack_software)
-				//Malf/Traitor AIs can bruteforce into the system to gain the Key.
-				dat += "<dd><A href='?src=[REF(src)];hack=1'><i><font color='Red'>*&@#. Bruteforce Key</font></i></font></a><br></dd>"
-			else
-				dat += "<br>"
-
-			//Bottom message
-			if(!auth)
-				dat += "<br><hr><dd><span class='notice'>Please authenticate with the server in order to show additional options.</span>"
-			else
-				dat += "<br><hr><dd><span class='warning'>Reg, #514 forbids sending messages to a Head of Staff containing Erotic Rendering Properties.</span>"
-
-		//Message Logs
-		if(1)
-			var/index = 0
-			dat += "<center><A href='?src=[REF(src)];back=1'>Back</a> - <A href='?src=[REF(src)];refresh=1'>Refresh</a></center><hr>"
-			dat += "<table border='1' width='100%'><tr><th width = '5%'>X</th><th width='15%'>Sender</th><th width='15%'>Recipient</th><th width='300px' word-wrap: break-word>Message</th></tr>"
-			for(var/datum/data_pda_msg/pda in linkedServer.pda_msgs)
-				index++
-				if(index > 3000)
-					break
-				// Del - Sender   - Recepient - Message
-				// X   - Al Green - Your Mom  - WHAT UP!?
-				dat += "<tr><td width = '5%'><center><A href='?src=[REF(src)];delete_logs=[REF(pda)]' style='color: rgb(255,0,0)'>X</a></center></td><td width='15%'>[pda.sender]</td><td width='15%'>[pda.recipient]</td><td width='300px'>[pda.message][pda.picture ? " <a href='byond://?src=[REF(pda)];photo=1'>(Photo)</a>":""]</td></tr>"
-			dat += "</table>"
-		//Hacking screen.
-		if(2)
-			if(isAI(user) || iscyborg(user))
-				dat += "Brute-forcing for server key.<br> It will take 20 seconds for every character that the password has."
-				dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time."
-			else
-				//It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever.
-				dat += {"01000010011100100111010101110100011001010010110<br>
-				10110011001101111011100100110001101101001011011100110011<br>
-				10010000001100110011011110111001000100000011100110110010<br>
-				10111001001110110011001010111001000100000011010110110010<br>
-				10111100100101110001000000100100101110100001000000111011<br>
-				10110100101101100011011000010000001110100011000010110101<br>
-				10110010100100000001100100011000000100000011100110110010<br>
-				10110001101101111011011100110010001110011001000000110011<br>
-				00110111101110010001000000110010101110110011001010111001<br>
-				00111100100100000011000110110100001100001011100100110000<br>
-				10110001101110100011001010111001000100000011101000110100<br>
-				00110000101110100001000000111010001101000011001010010000<br>
-				00111000001100001011100110111001101110111011011110111001<br>
-				00110010000100000011010000110000101110011001011100010000<br>
-				00100100101101110001000000111010001101000011001010010000<br>
-				00110110101100101011000010110111001110100011010010110110<br>
-				10110010100101100001000000111010001101000011010010111001<br>
-				10010000001100011011011110110111001110011011011110110110<br>
-				00110010100100000011000110110000101101110001000000111001<br>
-				00110010101110110011001010110000101101100001000000111100<br>
-				10110111101110101011100100010000001110100011100100111010<br>
-				10110010100100000011010010110111001110100011001010110111<br>
-				00111010001101001011011110110111001110011001000000110100<br>
-				10110011000100000011110010110111101110101001000000110110<br>
-				00110010101110100001000000111001101101111011011010110010<br>
-				10110111101101110011001010010000001100001011000110110001<br>
-				10110010101110011011100110010000001101001011101000010111<br>
-				00010000001001101011000010110101101100101001000000111001<br>
-				10111010101110010011001010010000001101110011011110010000<br>
-				00110100001110101011011010110000101101110011100110010000<br>
-				00110010101101110011101000110010101110010001000000111010<br>
-				00110100001100101001000000111001001101111011011110110110<br>
-				10010000001100100011101010111001001101001011011100110011<br>
-				10010000001110100011010000110000101110100001000000111010<br>
-				001101001011011010110010100101110"}
-
-		//Fake messages
-		if(3)
-			dat += "<center><A href='?src=[REF(src)];back=1'>Back</a> - <A href='?src=[REF(src)];Reset=1'>Reset</a></center><hr>"
-
-			dat += {"<table border='1' width='100%'>
-					<tr><td width='20%'><A href='?src=[REF(src)];select=Sender'>Sender</a></td>
-					<td width='20%'><A href='?src=[REF(src)];select=RecJob'>Sender's Job</a></td>
-					<td width='20%'><A href='?src=[REF(src)];select=Recepient'>Recipient</a></td>
-					<td width='300px' word-wrap: break-word><A href='?src=[REF(src)];select=Message'>Message</a></td></tr>"}
-				//Sender  - Sender's Job  - Recepient - Message
-				//Al Green- Your Dad	  - Your Mom  - WHAT UP!?
-
-			dat += {"<tr><td width='20%'>[customsender]</td>
-			<td width='20%'>[customjob]</td>
-			<td width='20%'>[customrecepient ? customrecepient.owner : "NONE"]</td>
-			<td width='300px'>[custommessage]</td></tr>"}
-			dat += "</table><br><center><A href='?src=[REF(src)];select=Send'>Send</a>"
-
-		//Request Console Logs
-		if(4)
-
-			var/index = 0
-			/* 	data_rc_msg
-				X												 - 5%
-				var/rec_dpt = "Unspecified" //name of the person - 15%
-				var/send_dpt = "Unspecified" //name of the sender- 15%
-				var/message = "Blank" //transferred message		 - 300px
-				var/stamp = "Unstamped"							 - 15%
-				var/id_auth = "Unauthenticated"					 - 15%
-				var/priority = "Normal"							 - 10%
-			*/
-			dat += "<center><A href='?src=[REF(src)];back=1'>Back</a> - <A href='?src=[REF(src)];refresh=1'>Refresh</a></center><hr>"
-			dat += {"<table border='1' width='100%'><tr><th width = '5%'>X</th><th width='15%'>Sending Dep.</th><th width='15%'>Receiving Dep.</th>
-			<th width='300px' word-wrap: break-word>Message</th><th width='15%'>Stamp</th><th width='15%'>ID Auth.</th><th width='15%'>Priority.</th></tr>"}
-			for(var/datum/data_rc_msg/rc in linkedServer.rc_msgs)
-				index++
-				if(index > 3000)
-					break
-				// Del - Sender   - Recepient - Message
-				// X   - Al Green - Your Mom  - WHAT UP!?
-				dat += {"<tr><td width = '5%'><center><A href='?src=[REF(src)];delete_requests=[REF(rc)]' style='color: rgb(255,0,0)'>X</a></center></td><td width='15%'>[rc.send_dpt]</td>
-				<td width='15%'>[rc.rec_dpt]</td><td width='300px'>[rc.message]</td><td width='15%'>[rc.stamp]</td><td width='15%'>[rc.id_auth]</td><td width='15%'>[rc.priority]</td></tr>"}
-			dat += "</table>"
-
-	message = defaultmsg
-	var/datum/browser/popup = new(user, "hologram_console", name, 700, 700)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open()
-
 /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user)
 	if(isnull(linkedServer))
 		to_chat(user, "<span class='warning'>Could not complete brute-force: Linked Server Disconnected!</span>")
@@ -245,10 +364,11 @@
 		var/currentKey = linkedServer.decryptkey
 		to_chat(user, "<span class='warning'>Brute-force completed! The key is '[currentKey]'.</span>")
 	hacking = FALSE
-	screen = 0 // Return the screen back to normal
+	message = ""
 
 /obj/machinery/computer/message_monitor/proc/UnmagConsole()
-	obj_flags &= ~EMAGGED
+	DISABLE_BITFIELD(obj_flags, EMAGGED)
+	message = ""
 
 /obj/machinery/computer/message_monitor/proc/ResetMessage()
 	customsender 	= "System Administrator"
@@ -256,199 +376,12 @@
 	custommessage 	= "This is a test, please ignore."
 	customjob 		= "Admin"
 
-/obj/machinery/computer/message_monitor/Topic(href, href_list)
-	if(..())
-		return
-
-	if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)) || hasSiliconAccessInArea(usr))
-		//Authenticate
-		if (href_list["auth"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				auth = FALSE
-				screen = 0
-			else
-				var/dkey = trim(input(usr, "Please enter the decryption key.") as text|null)
-				if(dkey && dkey != "")
-					if(linkedServer.decryptkey == dkey)
-						auth = TRUE
-					else
-						message = incorrectkey
-
-		//Turn the server on/off.
-		if (href_list["active"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				linkedServer.toggled = !linkedServer.toggled
-		//Find a server
-		if (href_list["find"])
-			var/list/message_servers = list()
-			for (var/obj/machinery/telecomms/message_server/M in GLOB.telecomms_list)
-				message_servers += M
-
-			if(message_servers.len > 1)
-				linkedServer = input(usr, "Please select a server.", "Select a server.", null) as null|anything in message_servers
-				message = "<span class='alert'>NOTICE: Server selected.</span>"
-			else if(message_servers.len > 0)
-				linkedServer = message_servers[1]
-				message =  "<span class='notice'>NOTICE: Only Single Server Detected - Server selected.</span>"
-			else
-				message = noserver
-
-		//View the logs - KEY REQUIRED
-		if (href_list["view_logs"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				screen = 1
-
-		//Clears the logs - KEY REQUIRED
-		if (href_list["clear_logs"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				linkedServer.pda_msgs = list()
-				message = "<span class='notice'>NOTICE: Logs cleared.</span>"
-		//Clears the request console logs - KEY REQUIRED
-		if (href_list["clear_requests"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				linkedServer.rc_msgs = list()
-				message = "<span class='notice'>NOTICE: Logs cleared.</span>"
-		//Change the password - KEY REQUIRED
-		if (href_list["pass"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				var/dkey = stripped_input(usr, "Please enter the decryption key.")
-				if(dkey && dkey != "")
-					if(linkedServer.decryptkey == dkey)
-						var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):"))
-						if(length(newkey) <= 3)
-							message = "<span class='notice'>NOTICE: Decryption key too short!</span>"
-						else if(length(newkey) > 16)
-							message = "<span class='notice'>NOTICE: Decryption key too long!</span>"
-						else if(newkey && newkey != "")
-							linkedServer.decryptkey = newkey
-						message = "<span class='notice'>NOTICE: Decryption key set.</span>"
-					else
-						message = incorrectkey
-
-		//Hack the Console to get the password
-		if (href_list["hack"])
-			var/mob/living/silicon/S = usr
-			if(istype(S) && S.hack_software)
-				hacking = TRUE
-				screen = 2
-				//Time it takes to bruteforce is dependant on the password length.
-				spawn(100*length(linkedServer.decryptkey))
-					if(src && linkedServer && usr)
-						BruteForce(usr)
-		//Delete the log.
-		if (href_list["delete_logs"])
-			//Are they on the view logs screen?
-			if(screen == 1)
-				if(LINKED_SERVER_NONRESPONSIVE)
-					message = noserver
-				else //if(istype(href_list["delete_logs"], /datum/data_pda_msg))
-					linkedServer.pda_msgs -= locate(href_list["delete_logs"])
-					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
-		//Delete the request console log.
-		if (href_list["delete_requests"])
-			//Are they on the view logs screen?
-			if(screen == 4)
-				if(LINKED_SERVER_NONRESPONSIVE)
-					message = noserver
-				else //if(istype(href_list["delete_logs"], /datum/data_pda_msg))
-					linkedServer.rc_msgs -= locate(href_list["delete_requests"])
-					message = "<span class='notice'>NOTICE: Log Deleted!</span>"
-		//Create a custom message
-		if (href_list["msg"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				screen = 3
-		//Fake messaging selection - KEY REQUIRED
-		if (href_list["select"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-				screen = 0
-			else
-				switch(href_list["select"])
-
-					//Reset
-					if("Reset")
-						ResetMessage()
-
-					//Select Your Name
-					if("Sender")
-						customsender = stripped_input(usr, "Please enter the sender's name.") || customsender
-
-					//Select Receiver
-					if("Recepient")
-						//Get out list of viable PDAs
-						var/list/obj/item/pda/sendPDAs = get_viewable_pdas()
-						if(GLOB.PDAs && GLOB.PDAs.len > 0)
-							customrecepient = input(usr, "Select a PDA from the list.") as null|anything in sortNames(sendPDAs)
-						else
-							customrecepient = null
-
-					//Enter custom job
-					if("RecJob")
-						customjob = stripped_input(usr, "Please enter the sender's job.") || customjob
-
-					//Enter message
-					if("Message")
-						custommessage = stripped_input(usr, "Please enter your message.") || custommessage
-
-					//Send message
-					if("Send")
-						if(isnull(customsender) || customsender == "")
-							customsender = "UNKNOWN"
-
-						if(isnull(customrecepient))
-							message = "<span class='notice'>NOTICE: No recepient selected!</span>"
-							return attack_hand(usr)
-
-						if(isnull(custommessage) || custommessage == "")
-							message = "<span class='notice'>NOTICE: No message entered!</span>"
-							return attack_hand(usr)
-
-						var/datum/signal/subspace/pda/signal = new(src, list(
-							"name" = "[customsender]",
-							"job" = "[customjob]",
-							"message" = custommessage,
-							"emojis" = TRUE,
-							"targets" = list("[customrecepient.owner] ([customrecepient.ownjob])")
-						))
-						// this will log the signal and transmit it to the target
-						linkedServer.receive_information(signal, null)
-						usr.log_message("(PDA: [name] | [usr.real_name]) sent \"[custommessage]\" to [signal.format_target()]", LOG_PDA)
-
-
-		//Request Console Logs - KEY REQUIRED
-		if(href_list["view_requests"])
-			if(LINKED_SERVER_NONRESPONSIVE)
-				message = noserver
-			else if(auth)
-				screen = 4
-
-		if (href_list["back"])
-			screen = 0
-
-	return attack_hand(usr)
-
-#undef LINKED_SERVER_NONRESPONSIVE
-
 /obj/item/paper/monitorkey
 	name = "monitor decryption key"
 
 /obj/item/paper/monitorkey/Initialize(mapload, obj/machinery/telecomms/message_server/server)
 	..()
-	if (server)
+	if(server)
 		print(server)
 		return INITIALIZE_HINT_NORMAL
 	else
@@ -460,7 +393,7 @@
 	add_overlay("paper_words")
 
 /obj/item/paper/monitorkey/LateInitialize()
-	for (var/obj/machinery/telecomms/message_server/server in GLOB.telecomms_list)
-		if (server.decryptkey)
+	for(var/obj/machinery/telecomms/message_server/server in GLOB.telecomms_list)
+		if(server.decryptkey)
 			print(server)
 			break

code/game/machinery/telecomms/computers/telemonitor.dm

@@ -1,4 +1,3 @@
-
 /*
 	Telecomms monitor tracks the overall trafficing of a telecommunications network
 	and displays a heirarchy of linked machines.
@@ -10,117 +9,98 @@
 	icon_screen = "comm_monitor"
 	desc = "Monitors the details of the telecommunications network it's synced with."
 
-	var/screen = 0				// the screen number:
 	var/list/machinelist = list()	// the machines located by the computer
-	var/obj/machinery/telecomms/SelectedMachine
+	var/obj/machinery/telecomms/SelectedMachine = null
 
 	var/network = "NULL"		// the network to probe
+	var/notice = ""
 
-	var/temp = ""				// temporary feedback messages
 	circuit = /obj/item/circuitboard/computer/comm_monitor
 
-/obj/machinery/computer/telecomms/monitor/ui_interact(mob/user)
-	. = ..()
-	var/dat = "<TITLE>Telecommunications Monitor</TITLE><center><b>Telecommunications Monitor</b></center>"
+/obj/machinery/computer/telecomms/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE,\
+														datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 
-	switch(screen)
+	if(!ui)
+		ui = new(user, src, ui_key, "telemonitor", name, 575, 400, master_ui, state)
+		ui.open()
 
+/obj/machinery/computer/telecomms/monitor/ui_data(mob/user)
+	var/list/data_out = list()
+	data_out["network"] = network
+	data_out["notice"] = notice
 
-	  // --- Main Menu ---
+	data_out["servers"] = list()
+	for(var/obj/machinery/telecomms/T in machinelist)
+		var/list/data = list(
+			name = T.name,
+			id = T.id,
+			ref = REF(T)
+		)
+		data_out["servers"] += list(data)
+	data_out["servers"] = sortList(data_out["servers"])
 
-		if(0)
-			dat += "<br>[temp]<br><br>"
-			dat += "<br>Current Network: <a href='?src=[REF(src)];network=1'>[network]</a><br>"
-			if(machinelist.len)
-				dat += "<br>Detected Network Entities:<ul>"
-				for(var/obj/machinery/telecomms/T in machinelist)
-					dat += "<li><a href='?src=[REF(src)];viewmachine=[T.id]'>[REF(T)] [T.name]</a> ([T.id])</li>"
-				dat += "</ul>"
-				dat += "<br><a href='?src=[REF(src)];operation=release'>\[Flush Buffer\]</a>"
-			else
-				dat += "<a href='?src=[REF(src)];operation=probe'>\[Probe Network\]</a>"
+	if(!SelectedMachine) //null is bad.
+		data_out["selected"] = null //but in js, null is good.
+		return data_out
+	
+	data_out["selected"] = list(
+		name = SelectedMachine.name,
+		id = SelectedMachine.id,
+		status = SelectedMachine.on,
+		traffic = SelectedMachine.traffic,
+		netspeed = SelectedMachine.netspeed,
+		freq_listening = SelectedMachine.freq_listening,
+		long_range_link = SelectedMachine.long_range_link,
+		ref = REF(SelectedMachine)
+	)
+	data_out["selected_servers"] = list()
+	for(var/obj/machinery/telecomms/T in SelectedMachine.links)
+		if(!T.hide)
+			var/list/data = list(
+				name = T.name,
+				id = T.id,
+				ref = REF(T)
+			)
+			data_out["selected_servers"] += list(data)
 
+	return data_out
 
-	  // --- Viewing Machine ---
-
-		if(1)
-			dat += "<br>[temp]<br>"
-			dat += "<center><a href='?src=[REF(src)];operation=mainmenu'>\[Main Menu\]</a></center>"
-			dat += "<br>Current Network: [network]<br>"
-			dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])<br>"
-			dat += "Linked Entities: <ol>"
-			for(var/obj/machinery/telecomms/T in SelectedMachine.links)
-				if(!T.hide)
-					dat += "<li><a href='?src=[REF(src)];viewmachine=[T.id]'>[REF(T.id)] [T.name]</a> ([T.id])</li>"
-			dat += "</ol>"
-
-
-
-	user << browse(dat, "window=comm_monitor;size=575x400")
-	onclose(user, "server_control")
-
-	temp = ""
-	return
-
-
-/obj/machinery/computer/telecomms/monitor/Topic(href, href_list)
+/obj/machinery/computer/telecomms/monitor/ui_act(action, params)
 	if(..())
 		return
+	switch(action)
+		if("mainmenu")
+			SelectedMachine = null
+			notice = ""
+			return
+		if("release")
+			machinelist = list()
+			notice = ""
+			return
+		if("network") //network change, flush the selected machine and buffer
+			var/newnet = sanitize(sanitize_text(params["value"], network))
+			if(length(newnet) > 15)	//i'm looking at you, you href fuckers
+				notice = "FAILED: Network tag string too lengthy"
+				return
+			network = newnet
+			SelectedMachine = null
+			machinelist = list()
+			return
+		if("probe")
+			if(LAZYLEN(machinelist) > 0)
+				notice = "FAILED: Cannot probe when buffer full"
+				return
+			
+			for(var/obj/machinery/telecomms/T in GLOB.telecomms_list)
+				if(T.network == network)
+					LAZYADD(machinelist, T)
 
-
-	add_fingerprint(usr)
-	usr.set_machine(src)
-
-	if(href_list["viewmachine"])
-		screen = 1
-		for(var/obj/machinery/telecomms/T in machinelist)
-			if(T.id == href_list["viewmachine"])
-				SelectedMachine = T
-				break
-
-	if(href_list["operation"])
-		switch(href_list["operation"])
-
-			if("release")
-				machinelist = list()
-				screen = 0
-
-			if("mainmenu")
-				screen = 0
-
-			if("probe")
-				if(machinelist.len > 0)
-					temp = "<font color = #D70B00>- FAILED: CANNOT PROBE WHEN BUFFER FULL -</font color>"
-
-				else
-					for(var/obj/machinery/telecomms/T in urange(25, src))
-						if(T.network == network)
-							machinelist.Add(T)
-
-					if(!machinelist.len)
-						temp = "<font color = #D70B00>- FAILED: UNABLE TO LOCATE NETWORK ENTITIES IN \[[network]\] -</font color>"
-					else
-						temp = "<font color = #336699>- [machinelist.len] ENTITIES LOCATED & BUFFERED -</font color>"
-
-					screen = 0
-
-
-	if(href_list["network"])
-
-		var/newnet = stripped_input(usr, "Which network do you want to view?", "Comm Monitor", network)
-		if(newnet && ((usr in range(1, src)) || hasSiliconAccessInArea(usr)))
-			if(length(newnet) > 15)
-				temp = "<font color = #D70B00>- FAILED: NETWORK TAG STRING TOO LENGHTLY -</font color>"
-
-			else
-				network = newnet
-				screen = 0
-				machinelist = list()
-				temp = "<font color = #336699>- NEW NETWORK TAG SET IN ADDRESS \[[network]\] -</font color>"
-
-	updateUsrDialog()
-	return
-
-/obj/machinery/computer/telecomms/monitor/attackby()
-	. = ..()
-	updateUsrDialog()
+			if(!LAZYLEN(machinelist))
+				notice = "FAILED: Unable to locate network entities in \[[network]\]"
+				return
+		if("viewmachine")
+			for(var/obj/machinery/telecomms/T in machinelist)
+				if(T.id == params["value"])
+					SelectedMachine = T
+					break

code/game/machinery/telecomms/machine_interactions.dm

@@ -9,9 +9,9 @@
 	var/temp = "" // output message
 
 /obj/machinery/telecomms/attackby(obj/item/P, mob/user, params)
-
 	var/icon_closed = initial(icon_state)
 	var/icon_open = "[initial(icon_state)]_o"
+	
 	if(!on)
 		icon_closed = "[initial(icon_state)]_off"
 		icon_open = "[initial(icon_state)]_o_off"
@@ -27,78 +27,240 @@
 	else
 		return ..()
 
-/obj/machinery/telecomms/ui_interact(mob/user)
-	. = ..()
-	// You need a multitool to use this, or be silicon
-	if(!hasSiliconAccessInArea(user))
-		// istype returns false if the value is null
-		if(!istype(user.get_active_held_item(), /obj/item/multitool))
-			return
+/obj/machinery/telecomms/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE,\
+									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	if(!canInteract(user))
+		if(ui)
+			ui.close() //haha no.
+		return
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+
+	if(!ui)
+		ui = new(user, src, ui_key, "teleinteract", "[name] Access", 520, 500, master_ui, state)
+		ui.open()
+
+/obj/machinery/telecomms/ui_data(mob/user)
+	. = list() //cpypaste from the vending bus
+	.["notice"] = temp
+	.["multitool"] = FALSE
 	var/obj/item/multitool/P = get_multitool(user)
-	var/dat
-	dat = "<font face = \"Courier\"><HEAD><TITLE>[name]</TITLE></HEAD><center><H3>[name] Access</H3></center>"
-	dat += "<br>[temp]<br>"
-	dat += "<br>Power Status: <a href='?src=[REF(src)];input=toggle'>[toggled ? "On" : "Off"]</a>"
-	if(on && toggled)
-		if(id != "" && id)
-			dat += "<br>Identification String: <a href='?src=[REF(src)];input=id'>[id]</a>"
-		else
-			dat += "<br>Identification String: <a href='?src=[REF(src)];input=id'>NULL</a>"
-		dat += "<br>Network: <a href='?src=[REF(src)];input=network'>[network]</a>"
-		dat += "<br>Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]"
-		if(hide)
-			dat += "<br>Shadow Link: ACTIVE</a>"
+	if(P)
+		.["multitool"] = TRUE
+		.["multitool_buf"] = null //to clean the list!
+		var/obj/machinery/telecomms/T = P.buffer
+		if(istype(T))
+			.["multitool_buf"] = list(
+				name = T.name,
+				id = T.id
+			)
 
-		//Show additional options for certain machines.
-		dat += Options_Menu()
+	.["machine"] = list()
+	.["machine"]["power"] = toggled
+	.["machine"]["id"] = id
+	.["machine"]["network"] = network
+	.["machine"]["prefab"] = LAZYLEN(autolinkers) ? TRUE : FALSE
+	.["machine"]["hidden"] = hide
 
-		dat += "<br>Linked Network Entities: <ol>"
+	.["links"] = list()
+	for(var/obj/machinery/telecomms/T in links)
+		if(T.hide && !hide)
+			continue
+		var/list/data = list(
+			name = T.name,
+			id = T.id,
+			ref = REF(T)
+		)
+		.["links"] += list(data)
 
-		var/i = 0
-		for(var/obj/machinery/telecomms/T in links)
-			i++
-			if(T.hide && !hide)
-				continue
-			dat += "<li>[REF(T)] [T.name] ([T.id])  <a href='?src=[REF(src)];unlink=[i]'>\[X\]</a></li>"
-		dat += "</ol>"
+	.["freq_listening"] = freq_listening
 
-		dat += "<br>Filtering Frequencies: "
+/obj/machinery/telecomms/relay/ui_data(mob/user)
+	. = ..()
+	.["machine"]["isrelay"] = TRUE
+	.["machine"]["broadcast"] = broadcasting
+	.["machine"]["receiving"] = receiving
 
-		i = 0
-		if(length(freq_listening))
-			for(var/x in freq_listening)
-				i++
-				if(i < length(freq_listening))
-					dat += "[format_frequency(x)] GHz<a href='?src=[REF(src)];delete=[x]'>\[X\]</a>; "
-				else
-					dat += "[format_frequency(x)] GHz<a href='?src=[REF(src)];delete=[x]'>\[X\]</a>"
-		else
-			dat += "NONE"
+/obj/machinery/telecomms/bus/ui_data(mob/user)
+	. = ..()
+	.["machine"]["isbus"] = TRUE
+	.["machine"]["chang_frequency"] = change_frequency
+	.["machine"]["chang_freq_value"] = change_freq_value
 
-		dat += "<br>  <a href='?src=[REF(src)];input=freq'>\[Add Filter\]</a>"
-		dat += "<hr>"
-
-		if(P)
-			var/obj/machinery/telecomms/T = P.buffer
-			if(istype(T))
-				dat += "<br><br>MULTITOOL BUFFER: [T] ([T.id]) <a href='?src=[REF(src)];link=1'>\[Link\]</a> <a href='?src=[REF(src)];flush=1'>\[Flush\]"
-			else
-				dat += "<br><br>MULTITOOL BUFFER: <a href='?src=[REF(src)];buffer=1'>\[Add Machine\]</a>"
-
-	dat += "</font>"
+/obj/machinery/telecomms/ui_act(action, params, datum/tgui/ui)
+	if(!canInteract(usr))
+		if(ui)
+			ui.close() //haha no.
+		return
 	temp = ""
-	user << browse(dat, "window=tcommachine;size=520x500;can_resize=0")
-	onclose(user, "tcommachine")
-	return TRUE
+
+	switch(action)
+		if("toggle")
+			toggled = !toggled
+			temp = "-% [src.name] has been [toggled ? "activated" : "deactivated"]. %-"
+			update_power()
+			return
+		if("machine")
+			if("id" in params)
+				if(!canAccess(usr))
+					return
+				//if the text is blank, return the id it was using
+				var/newid = sanitize_text(reject_bad_text(params["id"]), id) // reject_bad_text can return null!
+				if(length(newid) > 255)
+					temp = "-% Too many characters in new id tag. %-"
+					return
+				temp = "-% New ID assigned: \"[newid]\". %-"
+				id = newid
+				return
+			if("network" in params)
+				if(!canAccess(usr))
+					return
+				var/newnet = sanitize(sanitize_text(params["network"], network))	
+				if(length(newnet) > 15)
+					temp = "-% Too many characters in new network tag. %-"
+					return
+				network = newnet
+				links = list()
+				temp = "-% New network tag assigned: \"[network]\" %-"
+				return
+		if("multitool")
+			var/obj/item/multitool/P = get_multitool(usr)
+			if("Link" in params)
+				if(!canAccess(usr))
+					return
+				if(!istype(P))
+					temp = "-% Unable to acquire buffer %-"
+					return
+				
+				var/obj/machinery/telecomms/T = P.buffer
+				if(!istype(T) || T == src)
+					temp = "-% Unable to acquire buffer %-"
+					return
+				
+				if(!(src in T.links))
+					LAZYADD(T.links, src)
+
+				if(!(T in links))
+					LAZYADD(links, T)
+				temp = "-% Successfully linked with [REF(T)] [T.name] %-"
+
+			if("Flush" in params)
+				if(!istype(P))
+					temp = "-% Unable to acquire multitool %-"
+					return
+
+				temp = "-% Buffer successfully flushed. %-"
+				P.buffer = null
+
+			if("Add" in params)
+				if(!canAccess(usr))
+					return
+				if(!istype(P))
+					temp = "-% Unable to acquire multitool %-"
+					return
+
+				P.buffer = src
+				temp = "% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-"
+
+		if("unlink")
+			var/obj/machinery/telecomms/T = locate(params["value"])
+			if(!canAccess(usr))
+				return
+			if(!istype(T))
+				temp = "-% Unable to locate machine to unlink from, try again. %-"
+				return
+			
+			temp = "-% Removed [REF(T)] [T.name] from linked entities. %-"
+			if(T.links) //lazyrem makes blank list null, which is good but some might cause runtime ee's
+				T.links.Remove(src)
+			links.Remove(T)
+		if("freq")
+			if("add" in params)
+				var/newfreq = input("Specify a new frequency to filter (GHz). Decimals assigned automatically.", src.name, null) as null|num
+				if(!canAccess(usr) || !newfreq || isnull(newfreq))
+					return
+
+				if(findtext(num2text(newfreq), ".")) // did they not read the text?
+					newfreq *= 10 // shift the decimal one place
+
+				newfreq = sanitize_frequency(newfreq, TRUE) //sanitize
+				if(newfreq == FREQ_SYNDICATE)
+					temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-"
+					return
+				if(newfreq in freq_listening)
+					temp = "-% Error: Frequency already filtered %-"
+					return
+
+				LAZYADD(freq_listening, newfreq)
+				temp = "-% New frequency filter assigned: \"[newfreq] GHz\" %-"
+
+			if("remove" in params)
+				if(!canAccess(usr))
+					return
+				var/x = text2num(params["remove"])
+				temp = "-% Removed frequency filter [x] %-"
+				freq_listening.Remove(x)
+	
+/obj/machinery/telecomms/relay/ui_act(action, params)
+	..()
+	switch(action)
+		if("relay")
+			if("broadcast" in params)
+				if(!canAccess(usr))
+					return
+				broadcasting = !broadcasting
+				temp = "-% Broadcasting mode changed. %-"
+				return
+			if("receiving" in params)
+				if(!canAccess(usr))
+					return
+				receiving = !receiving
+				temp = "-% Receiving mode changed. %-"
+
+/obj/machinery/telecomms/bus/ui_act(action, params)
+	..()
+	switch(action)
+		if("frequency")
+			if("toggle" in params)
+				if(!canAccess(usr))
+					return
+				change_frequency = !change_frequency
+				return
+			if("adjust" in params)
+				var/newfreq = text2num(params["adjust"])
+				if(!canAccess(usr) || !newfreq)
+					return
+				// this should return true, unless the href is handcrafted
+				if(findtext(num2text(newfreq), "."))
+					newfreq *= 10 // shift the decimal one place
+
+				newfreq = sanitize_frequency(newfreq, TRUE)
+				if(newfreq == FREQ_SYNDICATE)
+					temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-"
+					return
+
+				change_freq_value = newfreq
+				temp = "-% New frequency to change to assigned: \"[newfreq] GHz\" %-"
+				return
+
+// Check if the user can use it.
+/obj/machinery/telecomms/proc/canInteract(mob/user)
+	if(hasSiliconAccessInArea(user) || istype(user.get_active_held_item(), /obj/item/multitool))
+		return TRUE
+	return FALSE
+// Check if the user is nearby and has a multitool.
+/obj/machinery/telecomms/proc/canAccess(mob/user)
+	if((canInteract(user) && in_range(user, src)) || hasSiliconAccessInArea(user))
+		return TRUE
+	return FALSE
 
 // Returns a multitool from a user depending on their mobtype.
-
 /obj/machinery/telecomms/proc/get_multitool(mob/user)
-
-	var/obj/item/multitool/P = null
-	// Let's double check
-	if(!hasSiliconAccessInArea(user) && istype(user.get_active_held_item(), /obj/item/multitool))
-		P = user.get_active_held_item()
+	if(!canInteract(user))
+		return null
+	var/obj/item/multitool/P = user.get_active_held_item()
+	// Is the ref not a null? and is it the actual type?
+	if(istype(P))
+		return P
 	else if(isAI(user))
 		var/mob/living/silicon/ai/U = user
 		P = U.aiMulti
@@ -106,170 +268,3 @@
 		if(istype(user.get_active_held_item(), /obj/item/multitool))
 			P = user.get_active_held_item()
 	return P
-
-// Additional Options for certain machines. Use this when you want to add an option to a specific machine.
-// Example of how to use below.
-
-/obj/machinery/telecomms/proc/Options_Menu()
-	return ""
-
-// The topic for Additional Options. Use this for checking href links for your specific option.
-// Example of how to use below.
-/obj/machinery/telecomms/proc/Options_Topic(href, href_list)
-	return
-
-// RELAY
-
-/obj/machinery/telecomms/relay/Options_Menu()
-	var/dat = ""
-	dat += "<br>Broadcasting: <A href='?src=[REF(src)];broadcast=1'>[broadcasting ? "YES" : "NO"]</a>"
-	dat += "<br>Receiving:    <A href='?src=[REF(src)];receive=1'>[receiving ? "YES" : "NO"]</a>"
-	return dat
-
-/obj/machinery/telecomms/relay/Options_Topic(href, href_list)
-
-	if(href_list["receive"])
-		receiving = !receiving
-		temp = "<font color = #666633>-% Receiving mode changed. %-</font color>"
-	if(href_list["broadcast"])
-		broadcasting = !broadcasting
-		temp = "<font color = #666633>-% Broadcasting mode changed. %-</font color>"
-
-// BUS
-
-/obj/machinery/telecomms/bus/Options_Menu()
-	var/dat = "<br>Change Signal Frequency: <A href='?src=[REF(src)];change_freq=1'>[change_frequency ? "YES ([change_frequency])" : "NO"]</a>"
-	return dat
-
-/obj/machinery/telecomms/bus/Options_Topic(href, href_list)
-
-	if(href_list["change_freq"])
-
-		var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num
-		if(canAccess(usr))
-			if(newfreq)
-				if(findtext(num2text(newfreq), "."))
-					newfreq *= 10 // shift the decimal one place
-				if(newfreq < 10000)
-					change_frequency = newfreq
-					temp = "<font color = #666633>-% New frequency to change to assigned: \"[newfreq] GHz\" %-</font color>"
-			else
-				change_frequency = 0
-				temp = "<font color = #666633>-% Frequency changing deactivated %-</font color>"
-
-
-/obj/machinery/telecomms/Topic(href, href_list)
-	if(..())
-		return
-
-	if(!hasSiliconAccessInArea(usr))
-		if(!istype(usr.get_active_held_item(), /obj/item/multitool))
-			return
-
-	var/obj/item/multitool/P = get_multitool(usr)
-
-	if(href_list["input"])
-		switch(href_list["input"])
-
-			if("toggle")
-
-				toggled = !toggled
-				temp = "<font color = #666633>-% [src] has been [toggled ? "activated" : "deactivated"].</font color>"
-				update_power()
-
-
-			if("id")
-				var/newid = reject_bad_text(stripped_input(usr, "Specify the new ID for this machine", src, id, MAX_MESSAGE_LEN))
-				if(newid && canAccess(usr))
-					id = newid
-					temp = "<font color = #666633>-% New ID assigned: \"[id]\" %-</font color>"
-
-			if("network")
-				var/newnet = stripped_input(usr, "Specify the new network for this machine. This will break all current links.", src, network)
-				if(newnet && canAccess(usr))
-
-					if(length(newnet) > 15)
-						temp = "<font color = #666633>-% Too many characters in new network tag %-</font color>"
-
-					else
-						for(var/obj/machinery/telecomms/T in links)
-							T.links.Remove(src)
-
-						network = newnet
-						links = list()
-						temp = "<font color = #666633>-% New network tag assigned: \"[network]\" %-</font color>"
-
-
-			if("freq")
-				var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num
-				if(newfreq && canAccess(usr))
-					if(findtext(num2text(newfreq), "."))
-						newfreq *= 10 // shift the decimal one place
-					if(newfreq == FREQ_SYNDICATE)
-						temp = "<font color = #FF0000>-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-</font color>"
-					else
-						if(!(newfreq in freq_listening) && newfreq < 10000)
-							freq_listening.Add(newfreq)
-							temp = "<font color = #666633>-% New frequency filter assigned: \"[newfreq] GHz\" %-</font color>"
-
-	if(href_list["delete"])
-
-		// changed the layout about to workaround a pesky runtime -- Doohl
-
-		var/x = text2num(href_list["delete"])
-		temp = "<font color = #666633>-% Removed frequency filter [x] %-</font color>"
-		freq_listening.Remove(x)
-
-	if(href_list["unlink"])
-
-		if(text2num(href_list["unlink"]) <= length(links))
-			var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])]
-			if(T)
-				temp = "<font color = #666633>-% Removed [REF(T)] [T.name] from linked entities. %-</font color>"
-
-				// Remove link entries from both T and src.
-
-				if(T.links)
-					T.links.Remove(src)
-				links.Remove(T)
-
-			else
-				temp = "<font color = #666633>-% Unable to locate machine to unlink from, try again. %-</font color>"
-
-	if(href_list["link"])
-
-		if(P)
-			var/obj/machinery/telecomms/T = P.buffer
-			if(istype(T) && T != src)
-				if(!(src in T.links))
-					T.links += src
-
-				if(!(T in links))
-					links += T
-
-				temp = "<font color = #666633>-% Successfully linked with [REF(T)] [T.name] %-</font color>"
-
-			else
-				temp = "<font color = #666633>-% Unable to acquire buffer %-</font color>"
-
-	if(href_list["buffer"])
-
-		P.buffer = src
-		temp = "<font color = #666633>-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-</font color>"
-
-
-	if(href_list["flush"])
-
-		temp = "<font color = #666633>-% Buffer successfully flushed. %-</font color>"
-		P.buffer = null
-
-	Options_Topic(href, href_list)
-
-	usr.set_machine(src)
-
-	updateUsrDialog()
-
-/obj/machinery/telecomms/proc/canAccess(mob/user)
-	if(hasSiliconAccessInArea(user) || in_range(user, src))
-		return TRUE
-	return FALSE

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

@@ -17,7 +17,8 @@
 	idle_power_usage = 50
 	netspeed = 40
 	circuit = /obj/item/circuitboard/machine/telecomms/bus
-	var/change_frequency = 0
+	var/change_frequency = FALSE
+	var/change_freq_value = 0
 
 /obj/machinery/telecomms/bus/RefreshParts()
 	idle_power_usage = 50
@@ -28,8 +29,8 @@
 	if(!istype(signal) || !is_freq_listening(signal))
 		return
 
-	if(change_frequency && signal.frequency != FREQ_SYNDICATE)
-		signal.frequency = change_frequency
+	if(change_frequency && (change_freq_value && signal.frequency != FREQ_SYNDICATE))
+		signal.frequency = change_freq_value
 
 	if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it
 		// send to one linked processor unit

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

@@ -140,11 +140,16 @@
 	..()
 	if(href_list["photo"])
 		var/mob/M = usr
-		M << browse_rsc(picture.picture_image, "pda_photo.png")
-		M << browse("<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title>PDA Photo</title></head>" \
-		+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
-		+ "<img src='pda_photo.png' width='192' style='-ms-interpolation-mode:nearest-neighbor' />" \
-		+ "</body></html>", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
+		
+		M << browse_rsc(picture.picture_image, "pda_photo.png") 
+		
+		var/dat = "<div style='overflow: hidden; margin :0; text-align: center'>"
+		dat += "<img src='pda_photo.png' width='192' style='-ms-interpolation-mode:nearest-neighbor' />"
+		dat += "</div>"
+
+		var/datum/browser/popup = new(M, "pdaphoto", "PDA Photo", picture.psize_x, picture.psize_y)
+		popup.set_content(dat)
+		popup.open()
 		onclose(M, "pdaphoto")
 
 /datum/data_rc_msg

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

@@ -33,7 +33,7 @@
 		totaltraffic += traffic // add current traffic to total traffic
 
 	// Delete particularly old logs
-	if (log_entries.len >= 400)
+	if(LAZYLEN(log_entries) >= 400) //[list].len is not safe
 		log_entries.Cut(1, 2)
 
 	var/datum/comm_log_entry/log = new

code/game/machinery/telecomms/telecomunications.dm

@@ -117,9 +117,9 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 			icon_state = "[initial(icon_state)]_off"
 
 /obj/machinery/telecomms/proc/update_power()
-
 	if(toggled)
-		if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off
+		// if powered, on. if not powered, off. if too damaged, off
+		if(CHECK_BITFIELD(stat, (BROKEN | NOPOWER | EMPED))) 
 			on = FALSE
 		else
 			on = TRUE
@@ -137,11 +137,11 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 
 /obj/machinery/telecomms/emp_act(severity)
 	. = ..()
-	if(. & EMP_PROTECT_SELF)
+	if(CHECK_BITFIELD(., EMP_PROTECT_SELF))
 		return
-	if(prob(100/severity))
-		if(!(stat & EMPED))
-			stat |= EMPED
-			var/duration = (300 * 10)/severity
+	if(prob(100 / severity))
+		if(!CHECK_BITFIELD(stat, EMPED))
+			ENABLE_BITFIELD(stat, EMPED)
+			var/duration = (300 * 10) / severity
 			spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot.
-				stat &= ~EMPED
+				DISABLE_BITFIELD(stat, EMPED)

code/game/mecha/mecha_construction_paths.dm

@@ -5,44 +5,42 @@
 	var/base_icon
 	var/looky_helpy = TRUE
 
-/datum/component/construction/mecha/examine(mob/user)
+/datum/component/construction/mecha/examine(datum/source, mob/user, list/examine_list)
 	. = ..()
 	if(looky_helpy)
 		switch(steps[index]["key"])
 			if(TOOL_WRENCH)
-				. += "<span class='notice'>The mech could be <b>wrenched</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech could be <b>wrenched</b> into place.</span>"
 			if(TOOL_SCREWDRIVER)
-				. += "<span class='notice'>The mech could be <b>screwed</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech could be <b>screwed</b> into place.</span>"
 			if(TOOL_WIRECUTTER)
-				. += "<span class='notice'>The mech wires could be <b>trimmed</b> into place.</span>"
+				examine_list += "<span class='notice'>The mech wires could be <b>trimmed</b> into place.</span>"
 			if(/obj/item/stack/cable_coil)
-				. += "<span class='notice'>The mech could use some <b>wiring</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>wiring</b>.</span>"
 			if(/obj/item/circuitboard)
-				. += "<span class='notice'>The mech could use a type of<b>circuitboard</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a type of<b>circuitboard</b>.</span>"
 			if(/obj/item/stock_parts/scanning_module)
-				. += "<span class='notice'>The mech could use a <b>scanning stock part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>scanning stock part</b>.</span>"
 			if(/obj/item/stock_parts/capacitor)
-				. += "<span class='notice'>The mech could use a <b>power based stock part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>power based stock part</b>.</span>"
 			if(/obj/item/stock_parts/cell)
-				. += "<span class='notice'>The mech could use a <b>power source</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>power source</b>.</span>"
 			if(/obj/item/stack/sheet/metal)
-				. += "<span class='notice'>The mech could use some <b>sheets of metal</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>sheets of metal</b>.</span>"
 			if(/obj/item/stack/sheet/plasteel)
-				. += "<span class='notice'>The mech could use some <b>sheets of strong steel</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use some <b>sheets of strong steel</b>.</span>"
 			if(/obj/item/bikehorn)
-				. += "<span class='notice'>HONK IT!.</span>"
+				examine_list += "<span class='notice'>HONK IT!.</span>"
 			if(/obj/item/clothing/mask/gas/clown_hat)
-				. += "<span class='notice'>GIVE IT CLOWN MAKEUP HONK!.</span>"
+				examine_list += "<span class='notice'>GIVE IT CLOWN MAKEUP HONK!.</span>"
 			if(/obj/item/clothing/shoes/clown_shoes)
-				. += "<span class='notice'>GIVE IT GOOFY SHOES HONK HONK!.</span>"
+				examine_list += "<span class='notice'>GIVE IT GOOFY SHOES HONK HONK!.</span>"
 			if(/obj/item/mecha_parts/part)
-				. += "<span class='notice'>The mech could use a mech <b>part</b>.</span>"
+				examine_list += "<span class='notice'>The mech could use a mech <b>part</b>.</span>"
 			if(/obj/item/stack/ore/bluespace_crystal)
-				. += "<span class='notice'>The mech could use a <b>crystal</b> of sorts.</span>"
+				examine_list += "<span class='notice'>The mech could use a <b>crystal</b> of sorts.</span>"
 			if(/obj/item/assembly/signaler/anomaly)
-				. += "<span class='notice'>The mech could use a <b>anomaly</b> of sorts.</span>"
-			else
-				return
+				examine_list += "<span class='notice'>The mech could use a <b>anomaly</b> of sorts.</span>"
 
 /datum/component/construction/mecha/spawn_result()
 	if(!result)

code/game/mecha/mecha_defense.dm

@@ -282,9 +282,9 @@
 	else
 		return ..()
 
-/obj/mecha/attacked_by(obj/item/I, mob/living/user)
+/obj/mecha/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
 	mecha_log_message("Attacked by [I]. Attacker - [user]")
-	..()
+	return ..()
 
 /obj/mecha/proc/mech_toxin_damage(mob/living/target)
 	playsound(src, 'sound/effects/spray2.ogg', 50, 1)

code/game/objects/effects/spawners/lootdrop.dm

@@ -611,13 +611,13 @@
 		/obj/item/clothing/mask/breath = 5,
 		/obj/item/clothing/mask/breath/medical = 1
 		)
- 
+
 /obj/effect/spawner/lootdrop/welder_tools/no_turf
 	spawn_on_turf = FALSE
 
 /obj/effect/spawner/lootdrop/low_tools/no_turf
 	spawn_on_turf = FALSE
- 
+
 /obj/effect/spawner/lootdrop/breathing_tanks/no_turf
 	spawn_on_turf = FALSE
 
@@ -644,3 +644,90 @@
 
 /obj/effect/spawner/lootdrop/glowstick/no_turf
 	spawn_on_turf = FALSE
+
+// Random Parts
+
+/obj/effect/spawner/lootdrop/stock_parts
+	name = "random stock parts spawner"
+	lootcount = 1
+	loot = list(
+				/obj/item/stock_parts/capacitor,
+				/obj/item/stock_parts/scanning_module,
+				/obj/item/stock_parts/manipulator,
+				/obj/item/stock_parts/micro_laser,
+				/obj/item/stock_parts/matter_bin,
+				/obj/item/stock_parts/cell
+				)
+
+// Random Weapon Parts
+
+/obj/effect/spawner/lootdrop/weapon_parts
+	name = "random weapon parts spawner 50%"
+	lootcount = 1
+	spawn_on_turf = FALSE
+	loot = list("" = 50,
+		/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 10,
+		/obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 5,
+		/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 10,
+		/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 3,
+		/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 3,
+		/obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
+		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 10,
+		/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+		)
+
+/obj/effect/spawner/lootdrop/weapon_parts
+	name = "random weapon parts spawner 25%"
+	lootcount = 1
+	spawn_on_turf = FALSE
+	loot = list("" = 75,
+		/obj/item/weaponcrafting/improvised_parts/barrel_rifle = 5,
+		/obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+		/obj/item/weaponcrafting/improvised_parts/rifle_receiver = 5,
+		/obj/item/weaponcrafting/improvised_parts/pistol_receiver = 2,
+		/obj/item/weaponcrafting/improvised_parts/trigger_assembly = 5,
+		/obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+		)
+
+/obj/effect/spawner/lootdrop/ammo
+	name = "random ammo 75%"
+	lootcount = 1
+	spawn_on_turf = FALSE
+	loot = list("" = 25,
+		/obj/item/ammo_box/c32mm = 15,
+		/obj/item/ammo_box/r32mm = 15,
+		/obj/item/ammo_box/magazine/wt550m9 = 1,
+		/obj/item/ammo_casing/shotgun/buckshot = 7,
+		/obj/item/ammo_casing/shotgun/rubbershot = 7,
+		/obj/item/ammo_casing/a762 = 15,
+		/obj/item/ammo_box/a762 = 15,
+		)
+
+/obj/effect/spawner/lootdrop/ammo/fiftypercent
+	name = "random ammo 50%"
+	lootcount = 1
+	spawn_on_turf = FALSE
+	loot = list("" = 50,
+		/obj/item/ammo_box/c32mm = 7,
+		/obj/item/ammo_box/r32mm = 7,
+		/obj/item/ammo_box/magazine/wt550m9 = 2,
+		/obj/item/ammo_casing/shotgun/buckshot = 10,
+		/obj/item/ammo_casing/shotgun/rubbershot = 10,
+		/obj/item/ammo_casing/a762 = 7,
+		/obj/item/ammo_box/a762 = 7,
+		)
+
+/obj/effect/spawner/lootdrop/ammo/shotgun
+	name = "random ammo 50%"
+	lootcount = 1
+	spawn_on_turf = FALSE
+	loot = list("" = 50,
+		/obj/item/ammo_box/shotgun/loaded/buckshot = 5,
+		/obj/item/ammo_box/shotgun/loaded/beanbag = 5,
+		/obj/item/ammo_box/shotgun/loaded/incendiary = 5,
+		/obj/item/ammo_casing/shotgun/buckshot = 8,
+		/obj/item/ammo_casing/shotgun/rubbershot = 9,
+		/obj/item/ammo_casing/shotgun = 8,
+		/obj/item/ammo_casing/shotgun/incendiary = 10,
+		)

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -95,6 +95,56 @@
 	icon_state = "warden_gaze"
 	duration = 3
 
+/obj/effect/temp_visual/ratvar/volt_hit
+	name = "volt blast"
+	layer = ABOVE_MOB_LAYER
+	duration = 8
+	icon_state = "volt_hit"
+	light_range = 1.5
+	light_power = 2
+	light_color = LIGHT_COLOR_ORANGE
+	var/mob/user
+	var/damage = 20
+
+/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster)
+	. = ..()
+	user = caster
+	if(user)
+		var/matrix/M = new
+		M.Turn(Get_Angle(src, user))
+		transform = M
+	INVOKE_ASYNC(src, .proc/volthit)
+
+/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
+	if(user)
+		Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
+	var/hit_amount = 0
+	var/turf/T = get_turf(src)
+	for(var/mob/living/L in T)
+		if(is_servant_of_ratvar(L))
+			continue
+		var/obj/item/I = L.anti_magic_check()
+		if(I)
+			L.visible_message("<span class='warning'>Strange energy flows into [L]'s [I.name]!</span>", \
+			"<span class='userdanger'>Your [I.name] shields you from [src]!</span>")
+			continue
+		L.visible_message("<span class='warning'>[L] is struck by a [name]!</span>", "<span class='userdanger'>You're struck by a [name]!</span>")
+		L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+		log_combat(user, L, "struck with a volt blast")
+		hit_amount++
+	for(var/obj/mecha/M in T)
+		if(M.occupant)
+			if(is_servant_of_ratvar(M.occupant))
+				continue
+			to_chat(M.occupant, "<span class='userdanger'>Your [M.name] is struck by a [name]!</span>")
+		M.visible_message("<span class='warning'>[M] is struck by a [name]!</span>")
+		M.take_damage(damage, BURN, 0, 0)
+		hit_amount++
+	if(hit_amount)
+		playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
+	else
+		playsound(src, "sparks", 50, 1)
+
 /obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
 	. = ..()
 	pixel_x = rand(-8, 8)

code/game/objects/items.dm

@@ -55,6 +55,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	/// How long, in deciseconds, this staggers for, if null it will autocalculate from w_class and force. Unlike total mass this supports 0 and negatives.
 	var/stagger_force
 
+	/**
+	  * Set FALSE and then checked at the end of on mob/living/attackby(), set TRUE on living/pre_attacked_by().
+	  * Should it be FALSE by the end of the item/attack(), that means the item overrode the standard attack behaviour
+	  * and the user still needs the delay applied. We can't be using return values since that'll stop afterattack() from being triggered.
+	  */
+	var/attack_delay_done = FALSE
+	///next_move click/attack delay of this item.
+	var/click_delay = CLICK_CD_MELEE
+
 	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	pass_flags = PASSTABLE
 	pressure_resistance = 4
@@ -132,6 +141,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
 	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
 
+	/* Our block parry data. Should be set in init, or something if you are using it.
+	 * This won't be accessed without ITEM_CAN_BLOCK or ITEM_CAN_PARRY so do not set it unless you have to to save memory.
+	 * If you decide it's a good idea to leave this unset while turning the flags on, you will runtime. Enjoy.
+	 * If this is set to a path, it'll run get_block_parry_data(path). YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
+	 */
+	var/datum/block_parry_data/block_parry_data
+
 	///Skills vars
 	//list of skill PATHS exercised when using this item. An associated bitfield can be set to indicate additional ways the skill is used by this specific item.
 	var/list/datum/skill/used_skills
@@ -231,9 +247,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			. += "[src] is made of cold-resistant materials."
 		if(resistance_flags & FIRE_PROOF)
 			. += "[src] is made of fire-retardant materials."
-
-
-
+	
+	if(item_flags & (ITEM_CAN_BLOCK | ITEM_CAN_PARRY))
+		var/datum/block_parry_data/data = return_block_parry_datum(block_parry_data)
+		. += "[src] has the capacity to be used to block and/or parry. <a href='?src=[REF(data)];name=[name];block=[item_flags & ITEM_CAN_BLOCK];parry=[item_flags & ITEM_CAN_PARRY];render=1'>\[Show Stats\]</a>"
 
 	if(!user.research_scanner)
 		return
@@ -395,6 +412,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	return ITALICS | REDUCE_RANGE
 
 /obj/item/proc/dropped(mob/user)
+	SHOULD_CALL_PARENT(TRUE)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.Remove(user)
@@ -407,6 +425,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 // called just as an item is picked up (loc is not yet changed)
 /obj/item/proc/pickup(mob/user)
+	SHOULD_CALL_PARENT(TRUE)
 	SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user)
 	item_flags |= IN_INVENTORY
 

code/game/objects/items/RCD.dm

@@ -154,7 +154,8 @@ RLD
 	icon_state = "rcd"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	custom_price = 900
+	custom_price = PRICE_ABOVE_EXPENSIVE
+	custom_premium_price = PRICE_ALMOST_ONE_GRAND
 	max_matter = 160
 	item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
 	has_ammobar = TRUE

code/game/objects/items/cards_ids.dm

@@ -187,6 +187,15 @@
 		if(ID_LOCKED_BANK_ACCOUNT)
 			registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings))
 
+/obj/item/card/id/Destroy()
+	if(bank_support == ID_LOCKED_BANK_ACCOUNT)
+		QDEL_NULL(registered_account)
+	else
+		registered_account = null
+	if(my_store)
+		my_store.my_card = null
+		my_store = null
+	return ..()
 
 /obj/item/card/id/vv_edit_var(var_name, var_value)
 	. = ..()

code/game/objects/items/chrono_eraser.dm

@@ -65,7 +65,7 @@
 	. = ..()
 	AddElement(/datum/element/update_icon_blocker)
 
-/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
 	if(field)
 		field_disconnect(field)
 	..()

code/game/objects/items/cigs_lighters.dm

@@ -8,6 +8,9 @@ CIGARS
 SMOKING PIPES
 CHEAP LIGHTERS
 ZIPPO
+ROLLING PAPER
+VAPES
+BONGS
 
 CIGARETTE PACKETS ARE IN FANCY.DM
 */
@@ -506,7 +509,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
 	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
-	custom_price = 55
+	custom_price = PRICE_ALMOST_CHEAP
 
 /obj/item/lighter/Initialize()
 	. = ..()
@@ -616,6 +619,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	desc = "A cheap-as-free lighter."
 	icon_state = "lighter"
 	fancy = FALSE
+	custom_price = PRICE_CHEAP_AS_FREE
 	overlay_list = list(
 		"transp",
 		"tall",
@@ -799,6 +803,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			to_chat(user, "<span class='warning'>You need to close the cap first!</span>")
 
 /obj/item/clothing/mask/vape/dropped(mob/user)
+	. = ..()
 	var/mob/living/carbon/C = user
 	if(C.get_item_by_slot(SLOT_WEAR_MASK) == src)
 		ENABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)

code/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -293,6 +293,10 @@
 	name = "Mining Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/mining
 
+/obj/item/circuitboard/computer/snow_taxi
+	name = "Snow Taxi (Computer Board)"
+	build_path = /obj/machinery/computer/shuttle/snow_taxi
+
 /obj/item/circuitboard/computer/white_ship
 	name = "White Ship (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/white_ship

code/game/objects/items/devices/flashlight.dm

@@ -1,7 +1,7 @@
 /obj/item/flashlight
 	name = "flashlight"
 	desc = "A hand-held emergency light."
-	custom_price = 100
+	custom_price = PRICE_REALLY_CHEAP
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "flashlight"
 	item_state = "flashlight"
@@ -211,6 +211,7 @@
 	light_color = "#CDDDFF"
 	flashlight_power = 0.9
 	hitsound = 'sound/weapons/genhit1.ogg'
+	custom_price = PRICE_ALMOST_CHEAP
 
 // the desk lamps are a bit special
 /obj/item/flashlight/lamp
@@ -351,12 +352,13 @@
 	brightness_on = 6	// luminosity when on
 	light_color = "#FFAA44"
 	flashlight_power = 0.8
+	custom_price = PRICE_CHEAP
 
 /obj/item/flashlight/lantern/jade
 	name = "jade lantern"
 	desc = "An ornate, green lantern."
 	color = LIGHT_COLOR_GREEN
-	light_color = LIGHT_COLOR_GREEN 
+	light_color = LIGHT_COLOR_GREEN
 
 /obj/item/flashlight/slime
 	gender = PLURAL
@@ -429,7 +431,7 @@
 /obj/item/flashlight/glowstick
 	name = "glowstick"
 	desc = "A military-grade glowstick."
-	custom_price = 50
+	custom_price = PRICE_CHEAP_AS_FREE
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 4
 	color = LIGHT_COLOR_GREEN

code/game/objects/items/devices/scanners.dm

@@ -6,12 +6,14 @@ T-RAY
 HEALTH ANALYZER
 GAS ANALYZER
 SLIME SCANNER
+NANITE SCANNER
+GENETICS SCANNER
 
 */
 /obj/item/t_scanner
 	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
-	custom_price = 150
+	custom_price = PRICE_REALLY_CHEAP
 	icon = 'icons/obj/device.dmi'
 	icon_state = "t-ray0"
 	var/on = FALSE
@@ -653,9 +655,10 @@ SLIME SCANNER
 			amount += inaccurate
 	return DisplayTimeText(max(1,amount))
 
-/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src)
+/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src, visible = TRUE)
 	var/icon = target
-	user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "<span class='notice'>You use the analyzer on [icon2html(icon, user)] [target].</span>")
+	if(visible)
+		user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "<span class='notice'>You use the analyzer on [icon2html(icon, user)] [target].</span>")
 	to_chat(user, "<span class='boldnotice'>Results of analysis of [icon2html(icon, user)] [target].</span>")
 
 	var/list/airs = islist(mixture) ? mixture : list(mixture)

code/game/objects/items/devices/sensor_device.dm

@@ -5,7 +5,7 @@
 	icon_state = "scanner"
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
-	custom_price = 900
+	custom_price = PRICE_ABOVE_EXPENSIVE
 
 /obj/item/sensor_device/attack_self(mob/user)
 	GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it

code/game/objects/items/kitchen.dm

@@ -71,7 +71,7 @@
 	sharpness = IS_SHARP_ACCURATE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
-	custom_price = 250
+	custom_price = PRICE_NORMAL
 
 /obj/item/kitchen/knife/Initialize()
 	. = ..()
@@ -131,7 +131,7 @@
 	custom_materials = list(/datum/material/iron=18000)
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	w_class = WEIGHT_CLASS_NORMAL
-	custom_price = 600
+	custom_price = PRICE_EXPENSIVE
 
 /obj/item/kitchen/knife/combat
 	name = "combat knife"
@@ -200,7 +200,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	custom_price = 200
+	custom_price = PRICE_ALMOST_CHEAP
 
 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/game/objects/items/melee/energy.dm

@@ -105,9 +105,28 @@
 	sharpness = IS_SHARP
 	embedding = list("embed_chance" = 75, "embedded_impact_pain_multiplier" = 10)
 	armour_penetration = 35
-	block_chance = 50
+	item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+	block_parry_data = /datum/block_parry_data/energy_sword
 	var/list/possible_colors = list("red" = LIGHT_COLOR_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
 
+/datum/block_parry_data/energy_sword
+	parry_time_windup = 0
+	parry_time_active = 25
+	parry_time_spindown = 0
+	// we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+	parry_time_windup_visual_override = 1
+	parry_time_active_visual_override = 3
+	parry_time_spindown_visual_override = 12
+	parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK		// esword users can attack while
+	parry_time_perfect = 2.5		// first ds isn't perfect
+	parry_time_perfect_leeway = 1.5
+	parry_imperfect_falloff_percent = 5
+	parry_efficiency_to_counterattack = 100
+	parry_efficiency_considered_successful = 65		// VERY generous
+	parry_efficiency_perfect = 100
+	parry_failed_stagger_duration = 4 SECONDS
+	parry_cooldown = 0.5 SECONDS
+
 /obj/item/melee/transforming/energy/sword/Initialize(mapload)
 	. = ..()
 	set_sword_color()
@@ -273,6 +292,10 @@
 	light_color = "#37FFF7"
 	actions_types = list()
 
+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+	icon_state_on = icon_state
+	return ..()
+
 /obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/update_icon_updates_onmob)
@@ -290,6 +313,7 @@
 	if(!supress_message_text)
 		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
 
+
 /obj/item/melee/transforming/energy/sword/cx/update_overlays()
 	. = ..()
 	var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")

code/game/objects/items/melee/misc.dm

@@ -61,13 +61,25 @@
 	force = 18
 	throwforce = 15
 	w_class = WEIGHT_CLASS_BULKY
-	block_chance = 50
 	armour_penetration = 75
 	sharpness = IS_SHARP
 	attack_verb = list("slashed", "cut")
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	custom_materials = list(/datum/material/iron = 1000)
 	total_mass = 3.4
+	item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+	block_parry_data = /datum/block_parry_data/captain_saber
+
+/datum/block_parry_data/captain_saber
+	parry_time_windup = 0.5
+	parry_time_active = 4
+	parry_time_spindown = 1
+	parry_time_perfect = 0.75
+	parry_time_perfect_leeway = 0.75
+	parry_imperfect_falloff_percent = 30
+	parry_efficiency_perfect = 100
+	parry_failed_stagger_duration = 3 SECONDS
+	parry_failed_clickcd_duration = 2 SECONDS
 
 /obj/item/melee/sabre/Initialize()
 	. = ..()
@@ -150,7 +162,6 @@
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	force = 15
 	throwforce = 25
-	block_chance = 50
 	armour_penetration = 200 //Apparently this gives it the ability to pierce block
 	flags_1 = CONDUCT_1
 	obj_flags = UNIQUE_RENAME
@@ -159,16 +170,47 @@
 	attack_verb = list("stabs", "punctures", "pierces", "pokes")
 	hitsound = 'sound/weapons/rapierhit.ogg'
 	total_mass = 0.4
+	item_flags = ITEM_CAN_PARRY | NEEDS_PERMIT
+	block_parry_data = /datum/block_parry_data/traitor_rapier
+
+// Fast, efficient parry.
+/datum/block_parry_data/traitor_rapier
+	parry_time_windup = 0.5
+	parry_time_active = 5
+	parry_time_spindown = 0
+	parry_time_active_visual_override = 3
+	parry_time_spindown_visual_override = 2
+	parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
+	parry_time_perfect = 0
+	parry_time_perfect_leeway = 3
+	parry_time_perfect_leeway_override = list(
+		TEXT_ATTACK_TYPE_PROJECTILE = 1
+	)
+	parry_imperfect_falloff_percent_override = list(
+		TEXT_ATTACK_TYPE_PROJECTILE = 50				// useless after 3rd decisecond
+	)
+	parry_imperfect_falloff_percent = 30
+	parry_efficiency_to_counterattack = 100
+	parry_efficiency_considered_successful = 1
+	parry_efficiency_perfect = 100
+	parry_data = list(
+		PARRY_DISARM_ATTACKER = TRUE,
+		PARRY_KNOCKDOWN_ATTACKER = 10
+	)
+	parry_failed_stagger_duration = 2 SECONDS
+	parry_failed_clickcd_duration = CLICK_CD_RANGE
+	parry_cooldown = 0
+
+/obj/item/melee/rapier/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text)
+	. = ..()
+	if((attack_type & ATTACK_TYPE_PROJECTILE) && (parry_efficiency >= 100))
+		. |= BLOCK_SHOULD_REDIRECT
+		return_list[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
 
 /obj/item/melee/rapier/Initialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 20, 65, 0)
 
-/obj/item/melee/rapier/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
-	if(attack_type == ATTACK_TYPE_PROJECTILE)
-		final_block_chance = 0
-	return ..()
-
 /obj/item/melee/rapier/on_exit_storage(datum/component/storage/S)
 	var/obj/item/storage/belt/sabre/rapier/B = S.parent
 	if(istype(B))
@@ -191,10 +233,9 @@
 	. = ..()
 	if(iscarbon(target))
 		var/mob/living/carbon/H = target
-		var/loss = H.getStaminaLoss()
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)
-		if((loss > 40) && prob(loss)) // if above 40, roll for sleep using 1% every 1 stamina damage
+		if(CHECK_STAMCRIT(H) != NOT_STAMCRIT)
 			H.Sleeping(180)
 
 /obj/item/melee/classic_baton
@@ -664,4 +705,4 @@
 	. = ..()
 	overlay = mutable_appearance(icon, overlay_state)
 	overlay.appearance_flags = RESET_COLOR
-	add_overlay(overlay)
+	add_overlay(overlay)

code/game/objects/items/pinpointer.dm

@@ -78,7 +78,7 @@
 	name = "crew pinpointer"
 	desc = "A handheld tracking device that points to crew suit sensors."
 	icon_state = "pinpointer_crew"
-	custom_price = 600
+	custom_price = PRICE_ABOVE_EXPENSIVE
 	var/has_owner = FALSE
 	var/pinpointer_owner = null
 

code/game/objects/items/plushes.dm

@@ -140,7 +140,8 @@
 	if(jsonlist["icon_state"])
 		icon_state = jsonlist["icon_state"]
 		item_state = jsonlist["item_state"]
-		icon = 'config/plushies/sprites.dmi'
+		var/static/config_sprites = file("config/plushies/sprites.dmi")
+		icon = config_sprites
 	if(jsonlist["attack_verb"])
 		attack_verb = jsonlist["attack_verb"]
 	if(jsonlist["squeak_override"])
@@ -436,13 +437,13 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
 /obj/item/toy/plush/random/Initialize()
 	var/newtype
 	var/list/snowflake_list = CONFIG_GET(keyed_list/snowflake_plushies)
-	
+
 	/// If there are no snowflake plushies we'll default to base plush, so we grab from the valid list
 	if (snowflake_list.len)
 		newtype = prob(CONFIG_GET(number/snowflake_plushie_prob)) ? /obj/item/toy/plush/random_snowflake : pick(GLOB.valid_plushie_paths)
-	else 
+	else
 		newtype = pick(GLOB.valid_plushie_paths)
-	
+
 	new newtype(loc)
 	return INITIALIZE_HINT_QDEL
 

code/game/objects/items/powerfist.dm

@@ -6,6 +6,7 @@
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	flags_1 = CONDUCT_1
+	item_flags = NEEDS_PERMIT | NO_COMBAT_MODE_FORCE_MODIFIER //To avoid ambushing and oneshotting healthy crewmembers on force setting 3.
 	attack_verb = list("whacked", "fisted", "power-punched")
 	force = 20
 	throwforce = 10
@@ -13,7 +14,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
 	resistance_flags = FIRE_PROOF
-	var/click_delay = 1.5
+	click_delay = CLICK_CD_MELEE * 1.5
 	var/fisto_setting = 1
 	var/gasperfist = 3
 	var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
@@ -70,42 +71,46 @@
 
 
 /obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
-    if(!tank)
-        to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
-        return
-    var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
-    var/turf/T = get_turf(src)
-    if(!T)
-        return
-    T.assume_air(gasused)
-    T.air_update_turf()
-    if(!gasused)
-        to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
-        target.apply_damage((force / 5), BRUTE)
-        playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punches you!</span>")
-        return
-    if(gasused.total_moles() < gasperfist * fisto_setting)
-        to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
-        playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
-        target.apply_damage((force / 2), BRUTE)
-        target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-            "<span class='userdanger'>[user]'s punch strikes with force!</span>")
-        return
-    target.apply_damage(force * fisto_setting, BRUTE)
-    target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
-        "<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-    new /obj/effect/temp_visual/kinetic_blast(target.loc)
-    playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
-    playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+	if(HAS_TRAIT(user, TRAIT_PACIFISM))
+		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
+		return FALSE
+	if(!tank)
+		to_chat(user, "<span class='warning'>\The [src] can't operate without a source of gas!</span>")
+		return FALSE
+	var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
+	var/turf/T = get_turf(src)
+	if(!T)
+		return FALSE
+	var/totalitemdamage = target.pre_attacked_by(src, user)
+	T.assume_air(gasused)
+	T.air_update_turf()
+	if(!gasused)
+		to_chat(user, "<span class='warning'>\The [src]'s tank is empty!</span>")
+		target.apply_damage((totalitemdamage / 5), BRUTE)
+		playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
+		target.visible_message("<span class='danger'>[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+		"<span class='userdanger'>[user]'s punches you!</span>")
+		return
+	if(gasused.total_moles() < gasperfist * fisto_setting)
+		to_chat(user, "<span class='warning'>\The [src]'s piston-ram lets out a weak hiss, it needs more gas!</span>")
+		playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
+		target.apply_damage((totalitemdamage / 2), BRUTE)
+		target.visible_message("<span class='danger'>[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+			"<span class='userdanger'>[user]'s punch strikes with force!</span>")
+		return
+	target.apply_damage(totalitemdamage * fisto_setting, BRUTE)
+	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!</span>", \
+		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
+	new /obj/effect/temp_visual/kinetic_blast(target.loc)
+	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
 
-    var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+	var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+	target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
 
-    target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
+	log_combat(user, target, "power fisted", src)
 
-    log_combat(user, target, "power fisted", src)
-
-    user.changeNext_move(CLICK_CD_MELEE * click_delay)
-
-    return
+	var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT)
+	if(weight)
+		user.adjustStaminaLossBuffered(weight)
+	return TRUE

code/game/objects/items/religion.dm

@@ -215,8 +215,9 @@
 /obj/item/clothing/head/helmet/plate/crusader/prophet
 	name = "Prophet's Hat"
 	desc = "A religious-looking hat."
+	icon_state = "prophet"
 	mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
-	flags_1 = 0
+	flags_1 = NONE
 	armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 70, "bio" = 50, "rad" = 50, "fire" = 60, "acid" = 60) //religion protects you from disease and radiation, honk.
 	worn_x_dimension = 64
 	worn_y_dimension = 64

code/game/objects/items/robot/robot_items.dm

@@ -358,6 +358,7 @@
 	check_amount()
 
 /obj/item/borg/lollipop/dropped(mob/user)
+	. = ..()
 	check_amount()
 
 /obj/item/borg/lollipop/proc/check_amount()	//Doesn't even use processing ticks.

code/game/objects/items/shields.dm

@@ -1,7 +1,8 @@
 /obj/item/shield
 	name = "shield"
 	icon = 'icons/obj/shields.dmi'
-	block_chance = 50
+	item_flags = ITEM_CAN_BLOCK
+	block_parry_data = /datum/block_parry_data/shield
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
 	/// Shield flags
 	var/shield_flags = SHIELD_FLAGS_DEFAULT
@@ -22,6 +23,18 @@
 	/// Shield bashing push distance
 	var/shieldbash_push_distance = 1
 
+/datum/block_parry_data/shield
+	block_damage_multiplier = 0.25
+	block_stamina_efficiency = 2.5
+	block_stamina_cost_per_second = 3.5
+	block_slowdown = 0
+	block_lock_attacking = FALSE
+	block_lock_sprinting = TRUE
+	block_start_delay = 1.5
+	block_damage_absorption = 5
+	block_resting_stamina_penalty_multiplier = 2
+	block_projectile_mitigation = 75
+
 /obj/item/shield/examine(mob/user)
 	. = ..()
 	if(shield_flags & SHIELD_CAN_BASH)
@@ -154,6 +167,22 @@
 	icon_state = "shield_bash"
 	duration = 3
 
+/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	if(ismovable(object))
+		var/atom/movable/AM = object
+		if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
+			return BLOCK_NONE
+	if(attack_type & ATTACK_TYPE_THROWN)
+		final_block_chance += 30
+	if(attack_type & ATTACK_TYPE_TACKLE)
+		final_block_chance = 100
+	. = ..()
+	if(. & BLOCK_SUCCESS)
+		on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+
+/obj/item/shield/on_active_block(mob/living/owner, atom/object, damage, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction)
+	on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance)
+
 /obj/item/shield/riot
 	name = "riot shield"
 	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
@@ -172,20 +201,7 @@
 	var/repair_material = /obj/item/stack/sheet/mineral/titanium
 	var/can_shatter = TRUE
 	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT
-	max_integrity = 75
-
-/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
-	if(ismovable(object))
-		var/atom/movable/AM = object
-		if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
-			return BLOCK_NONE
-	if(attack_type & ATTACK_TYPE_THROWN)
-		final_block_chance += 30
-	if(attack_type & ATTACK_TYPE_TACKLE)
-		final_block_chance = 100
-	. = ..()
-	if(. & BLOCK_SUCCESS)
-		on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+	max_integrity = 450
 
 /obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/melee/baton))
@@ -238,13 +254,13 @@
 	lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
 	shield_flags = SHIELD_FLAGS_DEFAULT
-	max_integrity = 55 //Weak
+	max_integrity = 300
 
 obj/item/shield/riot/bullet_proof
 	name = "bullet resistant shield"
 	desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
 	armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
-	max_integrity = 55 //Weaker
+	max_integrity = 300
 
 /obj/item/shield/riot/roman
 	name = "\improper Roman shield"
@@ -255,13 +271,13 @@ obj/item/shield/riot/bullet_proof
 	righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
 	repair_material = /obj/item/stack/sheet/mineral/wood
 	shield_flags = SHIELD_FLAGS_DEFAULT
-	max_integrity = 65
+	max_integrity = 250
 
 /obj/item/shield/riot/roman/fake
 	desc = "Bears an inscription on the inside: <i>\"Romanes venio domus\"</i>. It appears to be a bit flimsy."
 	block_chance = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	max_integrity = 30
+	max_integrity = 40
 
 /obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
 	playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -279,7 +295,7 @@ obj/item/shield/riot/bullet_proof
 	repair_material = /obj/item/stack/sheet/mineral/wood
 	block_chance = 30
 	shield_flags = SHIELD_FLAGS_DEFAULT
-	max_integrity = 55
+	max_integrity = 150
 
 /obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
 	playsound(owner, 'sound/effects/bang.ogg', 50)
@@ -297,13 +313,16 @@ obj/item/shield/riot/bullet_proof
 	throw_speed = 3
 	throw_range = 4
 	w_class = WEIGHT_CLASS_NORMAL
-	var/active = 0
+	var/active = FALSE
 
 /obj/item/shield/riot/tele/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
 	if(!active)
 		return BLOCK_NONE
 	return ..()
 
+/obj/item/shield/riot/tele/can_active_block()
+	return ..() && active
+
 /obj/item/shield/riot/tele/attack_self(mob/living/user)
 	active = !active
 	icon_state = "teleriot[active]"
@@ -335,8 +354,7 @@ obj/item/shield/riot/bullet_proof
 	icon_state = "makeshift_shield"
 	custom_materials = list(/datum/material/iron = 18000)
 	slot_flags = null
-	block_chance = 35
-	max_integrity = 100 //Made of metal welded together its strong but not unkillable
+	max_integrity = 300 //Made of metal welded together its strong but not unkillable
 	force = 10
 	throwforce = 7
 
@@ -346,7 +364,6 @@ obj/item/shield/riot/bullet_proof
 	armor = list("melee" = 95, "bullet" = 95, "laser" = 75, "energy" = 60, "bomb" = 90, "bio" = 90, "rad" = 0, "fire" = 90, "acid" = 10) //Armor for the item, dosnt transfer to user
 	item_state = "metal"
 	icon_state = "metal"
-	block_chance = 75 //1/4 shots will hit*
 	force = 16
 	slowdown = 2
 	throwforce = 15 //Massive pice of metal
@@ -357,19 +374,17 @@ obj/item/shield/riot/bullet_proof
 /obj/item/shield/riot/tower/swat
 	name = "swat shield"
 	desc = "A massive, heavy shield that can block a lot of attacks, can take a lot of abuse before breaking."
-	max_integrity = 175
-	block_chance = 50
+	max_integrity = 250
 
 /obj/item/shield/riot/implant
 	name = "telescoping shield implant"
 	desc = "A compact, arm-mounted telescopic shield. While nigh-indestructible when powered by a host user, it will eventually overload from damage. Recharges while inside its implant."
 	item_state = "metal"
 	icon_state = "metal"
-	block_chance = 50
 	slowdown = 1
 	shield_flags = SHIELD_FLAGS_DEFAULT
-	max_integrity = 60
-	obj_integrity = 60
+	max_integrity = 100
+	obj_integrity = 100
 	can_shatter = FALSE
 	item_flags = SLOWS_WHILE_IN_HAND
 	var/recharge_timerid

code/game/objects/items/stacks/medical.dm

@@ -96,7 +96,7 @@
 	var/stop_bleeding = 1800
 	var/heal_brute = 5
 	self_delay = 10
-	custom_price = 100
+	custom_price = PRICE_REALLY_CHEAP
 
 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
 	if(ishuman(M))

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -242,6 +242,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	null, \
 	new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 40), \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
+	new/datum/stack_recipe("pistol grip", /obj/item/weaponcrafting/improvised_parts/wooden_grip, 5, time = 40), \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
 	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \

code/game/objects/items/storage/bags.dm

@@ -427,3 +427,21 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_combined_w_class = INFINITY
 	STR.max_items = 100
+
+/obj/item/storage/bag/ammo
+	name = "ammo pouch"
+	desc = "A pouch for your ammo that goes in your pocket."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "ammopouch"
+	slot_flags = ITEM_SLOT_POCKET
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/ammo/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.max_combined_w_class = 30
+	STR.max_items = 3
+	STR.display_numerical_stacking = FALSE
+	STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))

code/game/objects/items/storage/belt.dm

@@ -713,7 +713,7 @@
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	dying_key = DYE_REGISTRY_FANNYPACK
-	custom_price = 100
+	custom_price = PRICE_ALMOST_CHEAP
 
 /obj/item/storage/belt/fannypack/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/boxes.dm

@@ -434,6 +434,7 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donkpocketbox"
 	illustration=null
+	custom_premium_price = PRICE_ABOVE_NORMAL // git gud
 
 /obj/item/storage/box/donkpockets/ComponentInitialize()
 	. = ..()
@@ -622,7 +623,7 @@
 	item_state = "zippo"
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
-	custom_price = 20
+	custom_price = PRICE_REALLY_CHEAP
 
 /obj/item/storage/box/matches/ComponentInitialize()
 	. = ..()
@@ -1343,6 +1344,7 @@
 	name = "box of marshmallows"
 	desc = "A box of marshmallows."
 	illustration = "marshmallow"
+	custom_premium_price = PRICE_BELOW_NORMAL
 
 /obj/item/storage/box/marshmallow/PopulateContents()
 	for (var/i in 1 to 5)

code/game/objects/items/storage/fancy.dm

@@ -70,6 +70,7 @@
 	name = "donut box"
 	spawn_type = /obj/item/reagent_containers/food/snacks/donut
 	fancy_open = TRUE
+	custom_price = PRICE_NORMAL
 
 /obj/item/storage/fancy/donut_box/ComponentInitialize()
 	. = ..()
@@ -136,7 +137,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
-	custom_price = 75
+	custom_price = PRICE_ALMOST_CHEAP
 
 /obj/item/storage/fancy/cigarettes/ComponentInitialize()
 	. = ..()
@@ -278,7 +279,7 @@
 ///The value in here has NOTHING to do with icons. It needs to be this for the proper examine.
 	icon_type = "rolling paper"
 	spawn_type = /obj/item/rollingpaper
-	custom_price = 25
+	custom_price = PRICE_REALLY_CHEAP
 
 /obj/item/storage/fancy/rollingpapers/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/firstaid.dm

@@ -432,8 +432,8 @@
 	throw_range = 7
 	var/empty = FALSE
 	item_state = "firstaid"
-	custom_price = 300
-	custom_premium_price = 500
+	custom_price = PRICE_ABOVE_NORMAL
+	custom_premium_price = PRICE_EXPENSIVE
 
 /obj/item/storage/hypospraykit/ComponentInitialize()
 	. = ..()

code/game/objects/items/stunbaton.dm

@@ -141,7 +141,7 @@
 /obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
 	var/interrupt = common_baton_melee(M, user, FALSE)
 	if(!interrupt)
-		..()
+		return ..()
 
 /obj/item/melee/baton/alt_pre_attack(atom/A, mob/living/user, params)
 	. = common_baton_melee(A, user, TRUE)		//return true (attackchain interrupt) if this also returns true. no harm-disarming.
@@ -154,7 +154,7 @@
 	if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
 		clowning_around(user)
 	if(IS_STAMCRIT(user))			//CIT CHANGE - makes it impossible to baton in stamina softcrit
-		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")
+		to_chat(user, "<span class='danger'>You're too exhausted to use [src] properly.</span>")
 		return TRUE
 	if(ishuman(M))
 		var/mob/living/carbon/human/L = M
@@ -170,10 +170,12 @@
 	return disarming || (user.a_intent != INTENT_HARM)
 
 /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE)
-	if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; check_shields() handles that
+	var/list/return_list = list()
+	if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; check_shields() handles that
 		playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
 		return FALSE
 	var/stunpwr = stamforce
+	stunpwr = block_calculate_resultant_damage(stunpwr, return_list)
 	var/obj/item/stock_parts/cell/our_cell = get_cell()
 	if(!our_cell)
 		switch_status(FALSE)

code/game/objects/items/tanks/tank_types.dm

@@ -93,11 +93,13 @@
 		F.update_icon()
 	else
 		return ..()
+//Makes empty oxygen tanks spawn without gas
+/obj/item/tank/internals/plasma/empty/populate_gas()
+	return
 
 /obj/item/tank/internals/plasma/full/populate_gas()
 	air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 
-
 /*
  * Plasmaman Plasma Tank
  */
@@ -130,6 +132,7 @@
 	air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 	return
 
+//makes empty plasma tanks spawn without gas.
 /obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
 	return
 

code/game/objects/items/tanks/tanks.dm

@@ -153,6 +153,10 @@
 
 	return (BRUTELOSS)
 
+/obj/item/tank/attack_ghost(mob/dead/observer/O)
+	. = ..()
+	atmosanalyzer_scan(air_contents, O, src, FALSE)
+
 /obj/item/tank/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
 	if(istype(W, /obj/item/assembly_holder))

code/game/objects/items/tanks/watertank.dm

@@ -145,7 +145,7 @@
 	desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
 	icon_state = "waterbackpackjani"
 	item_state = "waterbackpackjani"
-	custom_price = 1000
+	custom_price = PRICE_ALMOST_ONE_GRAND
 
 /obj/item/watertank/janitor/Initialize()
 	. = ..()

code/game/objects/items/toys.dm

@@ -446,6 +446,7 @@
 	throw_range = 5
 	force_unwielded = 0
 	force_wielded = 0
+	block_parry_data = null
 	attack_verb = list("attacked", "struck", "hit")
 	total_mass_on = TOTAL_MASS_TOY_SWORD
 	sharpness = IS_BLUNT
@@ -835,11 +836,11 @@
 
 /obj/item/toy/cards/deck/update_icon_state()
 	switch(cards.len)
-		if(INFINITY to original_size/2)
+		if(original_size*0.5 to INFINITY)
 			icon_state = "deck_[deckstyle]_full"
-		if(original_size/2 to  original_size/4)
+		if(original_size*0.25 to original_size*0.5)
 			icon_state = "deck_[deckstyle]_half"
-		if(original_size/4 to 1)
+		if(1 to original_size*0.25)
 			icon_state = "deck_[deckstyle]_low"
 		else
 			icon_state = "deck_[deckstyle]_empty"