July 5th TG sync (#1883)

July 5th TG sync

code/game/gamemodes/gang/dominator.dm

@@ -98,7 +98,7 @@
 			else
 				playsound(loc, 'sound/weapons/tap.ogg', 50, 1)
 		if(BURN)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
 
 /obj/machinery/dominator/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
 	. = ..()
@@ -228,4 +228,4 @@
 		gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
 		for(var/datum/gang/G in SSticker.mode.gangs)
 			if(G != gang)
-				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)
+				G.message_gangtools("Enemy takeover attempt detected in [locname]: Estimated [time] minutes until our defeat.",1,1)

code/game/gamemodes/gang/gang.dm

@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather,/
 			var/mob/living/carbon/carbon_mob = gangster_mind.current
 			carbon_mob.silent = max(carbon_mob.silent, 5)
 			carbon_mob.flash_act(1, 1)
-		gangster_mind.current.Stun(5)
+		gangster_mind.current.Stun(100)
 	if(G.is_deconvertible)
 		to_chat(gangster_mind.current, "<FONT size=3 color=red><B>You are now a member of the [G.name] Gang!</B></FONT>")
 		to_chat(gangster_mind.current, "<font color='red'>Help your bosses take over the station by claiming territory with <b>special spraycans</b> only they can provide. Simply spray on any unclaimed area of the station.</font>")
@@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather,/
 			message_admins("[ADMIN_LOOKUPFLW(gangster_mind.current)] has been borged while being a member of the [gang.name] Gang. They are no longer a gangster.")
 		else
 			if(!silent)
-				gangster_mind.current.Paralyse(5)
+				gangster_mind.current.Unconscious(100)
 				gangster_mind.current.visible_message("<FONT size=3><B>[gangster_mind.current] looks like they've given up the life of crime!<B></font>")
 			to_chat(gangster_mind.current, "<FONT size=3 color=red><B>You have been reformed! You are no longer a gangster!</B><BR>You try as hard as you can, but you can't seem to recall any of the identities of your former gangsters...</FONT>")
 			gangster_mind.memory = ""

code/game/gamemodes/gang/gang_items.dm

@@ -345,7 +345,6 @@
 	if(spawn_msg)
 		to_chat(user, spawn_msg)
 
-
 /datum/gang_item/equipment/wetwork_boots
 	name = "Wetwork boots"
 	id = "wetwork"

code/game/gamemodes/gang/gang_pen.dm

@@ -35,7 +35,7 @@
 							cooldown(G)
 						if(2)
 							new /obj/item/device/gangtool/soldier(M)
-							M.Paralyse(5)
+							M.Unconscious(100)
 							cooldown(G)
 						if(1)
 							to_chat(user, "<span class='warning'>This mind is resistant to recruitment!</span>")

code/game/gamemodes/gang/recaller.dm

@@ -226,7 +226,7 @@
 /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user)
 	if(!istype(user))
 		return 0
-	if(user.restrained() || user.lying || user.stat || user.stunned || user.weakened)
+	if(user.incapacitated())
 		return 0
 	if(!(src in user.contents))
 		return 0