.rej cleanup

2017-06-26 06:14:42 -05:00
parent bebda394f4
commit 5571cca37c
21 changed files with 0 additions and 339 deletions
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm	(rejected hunks)
-@@ -171,7 +171,7 @@
- 		return 0
- 	if(cooldown > world.time)
- 		if(!CM.active)
-			owner << "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>"
-+			to_chat(owner, "<span class='cultlarge'><b>You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!</b></span>")
- 		return 0
- 	return ..()
- 
@@ -1,53 +0,0 @@
-diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm	(rejected hunks)
-@@ -170,35 +170,35 @@
- 
- 	gang.message_gangtools("[usr] is attempting to recall the emergency shuttle.")
- 	recalling = 1
-	to_chat(loc, "<span class='info'>\icon[src]Generating shuttle recall order with codes retrieved from last call signal...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Generating shuttle recall order with codes retrieved from last call signal...</span>")
- 
- 	sleep(rand(100,300))
- 
- 	if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station
-		to_chat(user, "<span class='warning'>\icon[src]Emergency shuttle cannot be recalled at this time.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Emergency shuttle cannot be recalled at this time.</span>")
- 		recalling = 0
- 		return 0
-	to_chat(loc, "<span class='info'>\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Shuttle recall order generated. Accessing station long-range communication arrays...</span>")
- 
- 	sleep(rand(100,300))
- 
- 	if(!gang.dom_attempts)
-		to_chat(user, "<span class='warning'>\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.</span>")
- 		recalling = 0
- 		return 0
- 
- 	var/turf/userturf = get_turf(user)
- 	if(userturf.z != 1) //Shuttle can only be recalled while on station
-		to_chat(user, "<span class='warning'>\icon[src]Error: Device out of range of station communication arrays.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Device out of range of station communication arrays.</span>")
- 		recalling = 0
- 		return 0
- 	var/datum/station_state/end_state = new /datum/station_state()
- 	end_state.count()
- 	if((100 *  start_state.score(end_state)) < 80) //Shuttle cannot be recalled if the station is too damaged
-		to_chat(user, "<span class='warning'>\icon[src]Error: Station communication systems compromised. Unable to establish connection.</span>")
-+		to_chat(user, "<span class='warning'>[bicon(src)]Error: Station communication systems compromised. Unable to establish connection.</span>")
- 		recalling = 0
- 		return 0
-	to_chat(loc, "<span class='info'>\icon[src]Comm arrays accessed. Broadcasting recall signal...</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]Comm arrays accessed. Broadcasting recall signal...</span>")
- 
- 	sleep(rand(100,300))
- 
-@@ -210,7 +210,7 @@
- 		if(SSshuttle.cancelEvac(user))
- 			return 1
- 
-	to_chat(loc, "<span class='info'>\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.</span>")
-+	to_chat(loc, "<span class='info'>[bicon(src)]No response recieved. Emergency shuttle cannot be recalled at this time.</span>")
- 	return 0
- 
- /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user)