Cleans up .rej spam and the empty file from #2792 (#2818)

* Cleans up .rej spam and the empty file from #2792 * Update tgstation.dme
2017-09-17 11:56:55 -05:00
parent 9e0f4c402b
commit dd4f68dfee
19 changed files with 0 additions and 393 deletions
@@ -1,9 +0,0 @@
-diff a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm	(rejected hunks)
-@@ -108,6 +108,7 @@
- 		new_objective.explanation_text = "Protect [usr.real_name], the wizard."
- 		M.mind.objectives += new_objective
- 	SSticker.mode.apprentices += M.mind
-+	M.mind.assigned_role = "Apprentice"
- 	M.mind.special_role = "apprentice"
- 	SSticker.mode.update_wiz_icons_added(M.mind)
- 	M << sound('sound/effects/magic.ogg')
@@ -1 +0,0 @@
-//Todo
@@ -1,11 +0,0 @@
-diff a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm	(rejected hunks)
-@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
- 	owner_AI.nuking = TRUE
- 	owner_AI.doomsday_device = DOOM
- 	owner_AI.doomsday_device.start()
-	for(var/pinpointer in GLOB.pinpointer_list)
-		var/obj/item/weapon/pinpointer/P = pinpointer
-+	for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list)
- 		P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes
- 	qdel(src)
- 
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm	(rejected hunks)
-@@ -325,7 +325,7 @@
- 	gloves = /obj/item/clothing/gloves/combat
- 	back = /obj/item/weapon/storage/backpack
- 	ears = /obj/item/device/radio/headset/syndicate/alt
-	l_pocket = /obj/item/weapon/pinpointer/syndicate
-+	l_pocket = /obj/item/weapon/pinpointer/nuke/syndicate
- 	id = /obj/item/weapon/card/id/syndicate
- 	belt = /obj/item/weapon/gun/ballistic/automatic/pistol
- 	backpack_contents = list(/obj/item/weapon/storage/box/syndie=1)
@@ -1,33 +0,0 @@
-diff a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm	(rejected hunks)
-@@ -362,9 +362,9 @@
- 	if(safety)
- 		if(timing)
- 			set_security_level(previous_level)
-			for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+			for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 				S.switch_mode_to(initial(S.mode))
-				S.nuke_warning = FALSE
-+				S.alert = FALSE
- 		timing = FALSE
- 		bomb_set = TRUE
- 		detonation_timer = null
-@@ -381,16 +381,16 @@
- 		bomb_set = TRUE
- 		set_security_level("delta")
- 		detonation_timer = world.time + (timer_set * 10)
-		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 			S.switch_mode_to(TRACK_INFILTRATOR)
- 		countdown.start()
- 	else
- 		bomb_set = FALSE
- 		detonation_timer = null
- 		set_security_level(previous_level)
-		for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list)
-+		for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list)
- 			S.switch_mode_to(initial(S.mode))
-			S.nuke_warning = FALSE
-+			S.alert = FALSE
- 		countdown.stop()
- 	update_icon()
- 
@@ -1,21 +0,0 @@
-diff a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm	(rejected hunks)
-@@ -30,7 +30,6 @@
- 						var/mob/living/L = loc
- 						to_chat(L, "<span class='userdanger'>Your [name] vibrates and lets out a tinny alarm. Uh oh.</span>")
- 
-
- /obj/item/pinpointer/nuke/scan_for_target()
- 	target = null
- 	switch(mode)
-@@ -58,10 +57,10 @@
- 	mode = new_mode
- 	scan_for_target()
- 
-
- /obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active.
- 	name = "syndicate pinpointer"
- 	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
-+	icon_state = "pinpointer_syndicate"
- 
- /obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
- 	name = "cyborg syndicate pinpointer"
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm	(rejected hunks)
-@@ -158,7 +158,7 @@
- 	difficulty = 10
- 
- //Old ninja objectives.
-/datum/objective_item/special/pinpointer
-+/datum/objective_item/special/pinpointer/nuke
- 	name = "the captain's pinpointer."
- 	targetitem = /obj/item/pinpointer
- 	difficulty = 10