Merge branch 'syndicate_affiliates_2.0' of https://github.com/Anorak2…

…024/Paradise into syndicate_affiliates_2.0

code/game/mecha/equipment/tools/mining_tools.dm

@@ -16,6 +16,13 @@
 	var/drill_delay = 7
 	var/drill_level = DRILL_BASIC
 
+/obj/item/mecha_parts/mecha_equipment/drill/action_checks(atom/target)
+	. = ..()
+	if(!.)
+		return
+
+	return chassis.Adjacent(target)
+
 /obj/item/mecha_parts/mecha_equipment/drill/action(atom/target)
 	if(!action_checks(target))
 		return FALSE

code/modules/clothing/ears/ears.dm

@@ -9,3 +9,23 @@
 	strip_delay = 15
 	put_on_delay = 25
 	resistance_flags = FLAMMABLE
+
+/obj/item/clothing/ears/earrings
+	name = "Earrings"
+	desc = "Простые золотые серёжки"
+	icon_state = "earring_gold"
+	item_state = "earring_gold"
+	slot_flags = ITEM_SLOT_EARS
+	species_restricted = list(SPECIES_HUMAN, SPECIES_VOX, SPECIES_VULPKANIN, SPECIES_TAJARAN, SPECIES_DIONA, SPECIES_DRASK, SPECIES_SLIMEPERSON, SPECIES_SKRELL, SPECIES_MACNINEPERSON, SPECIES_MOTH, SPECIES_NUCLEATION)
+
+/obj/item/clothing/ears/earrings/Nt
+	name = "Earrings NT"
+	desc = "Золотые серьги с гравировкой НТ"
+	icon_state = "earring_NT"
+	item_state = "earring_NT"
+
+/obj/item/clothing/ears/earrings/silver
+	name = "Silver earings"
+	desc = "Простые серебряные серьги"
+	icon_state = "earring_silver"
+	item_state = "earring_silver"

code/modules/instruments/objs/items/headphones.dm

@@ -3,7 +3,7 @@
 	desc = "Unce unce unce unce."
 	icon_state = "headphones0"
 	item_state = "headphones0"
-	slot_flags_2 = ITEM_FLAG_TWOEARS
+	slot_flags = ITEM_SLOT_EARS
 	actions_types = list(/datum/action/item_action/change_headphones_song)
 	var/datum/song/headphones/song
 	var/on = FALSE

code/modules/mining/equipment/survival_pod.dm

@@ -263,6 +263,7 @@
 	anchored = TRUE
 	density = TRUE
 	pixel_y = -32
+	move_resist = MOVE_FORCE_STRONG
 
 
 /obj/item/gps/computer/wrench_act(mob/living/user, obj/item/I)

code/modules/paperwork/paperbin.dm

@@ -93,7 +93,14 @@
 			return ..()
 		to_chat(user, span_notice("You have put [I] into [src]."))
 		papers.Add(I)
+		var/do_update = FALSE
+		if(amount == 0)
+			do_update = TRUE
+
 		amount++
+		if(do_update)
+			update_icon(UPDATE_ICON_STATE)
+
 		return ATTACK_CHAIN_BLOCKED_ALL
 
 	return ..()

code/modules/paperwork/photocopier.dm

@@ -586,13 +586,13 @@
 	if(istype(I, /obj/item/toner))
 		add_fingerprint(user)
 		var/obj/item/toner/toner = I
-		if(toner > 10) //allow replacing when low toner is affecting the print darkness
+		if(src.toner > 10) //allow replacing when low toner is affecting the print darkness
 			to_chat(user, span_warning("This cartridge is not yet ready for replacement! Use up the rest of the toner."))
 			return ATTACK_CHAIN_PROCEED
 		if(!user.drop_transfer_item_to_loc(I, src))
 			return ..()
 		to_chat(user, span_notice("You have inserted the toner cartridge into [src]."))
-		toner += toner.toner_amount
+		src.toner += toner.toner_amount
 		qdel(I)
 		return ATTACK_CHAIN_BLOCKED_ALL
 

code/modules/station_goals/brs/brs_stationary_scanner.dm

@@ -205,8 +205,8 @@
 
 	// It's a large machine, add a delay
 	user.visible_message(
-		"[user] начина[pluralize_ru(user.gender, "ет", "ют")] [panel_open ? "От" : "За"]кручивать панель [src].",
-		"Вы начинаете [panel_open ? "От" : "За"]кручивать панель [src]."
+		"[user] начина[pluralize_ru(user.gender, "ет", "ют")] [panel_open ? "за" : "от"]кручивать панель [src].",
+		"Вы начинаете [panel_open ? "за" : "от"]кручивать панель [src]."
 	)
 	if(!I.use_tool(src, user, 3 SECONDS, volume = I.tool_volume))
 		return