rej cleanup

2017-05-17 03:50:34 -05:00
parent 3516852582
commit f978e3d56e
20 changed files with 0 additions and 531 deletions
@@ -1,33 +0,0 @@
-diff a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm	(rejected hunks)
-@@ -4,7 +4,7 @@
- 	var/eldergod = 1 //for the summon god objective
- 
- /proc/iscultist(mob/living/M)
-	return istype(M) && M.has_antag_datum(/datum/antagonist/cultist, TRUE)
-+	return istype(M) && M.mind && M.mind.has_antag_datum(ANTAG_DATUM_CULT)
- 
- /proc/is_sacrifice_target(datum/mind/mind)
- 	if(mind == GLOB.sac_mind)
-@@ -163,18 +163,18 @@
- /datum/game_mode/proc/add_cultist(datum/mind/cult_mind, stun) //BASE
- 	if (!istype(cult_mind))
- 		return 0
-	if(cult_mind.current.gain_antag_datum(/datum/antagonist/cultist))
-+	if(cult_mind.add_antag_datum(ANTAG_DATUM_CULT))
- 		if(stun)
- 			cult_mind.current.Paralyse(5)
- 		return 1
- 
- /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1, stun)
- 	if(cult_mind.current)
-		var/datum/antagonist/cultist/cult_datum = cult_mind.current.has_antag_datum(/datum/antagonist/cultist, TRUE)
-+		var/datum/antagonist/cult/cult_datum = cult_mind.has_antag_datum(ANTAG_DATUM_CULT)
- 		if(!cult_datum)
- 			return FALSE
-		cult_datum.silent_update = show_message
-		cult_datum.on_remove()
-+		cult_datum.silent = show_message
-+		cult_datum.on_removal()
- 		if(stun)
- 			cult_mind.current.Paralyse(5)
- 		return TRUE
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm	(rejected hunks)
-@@ -258,6 +258,8 @@
- 	if(escaped_total > 0)
- 		feedback_set("escaped_total",escaped_total)
- 	send2irc("Server", "Round just ended.")
-+	if(cult.len && !istype(SSticker.mode,/datum/game_mode/cult))
-+		datum_cult_completion()
- 	return 0
- 
- 
@@ -1,38 +0,0 @@
-diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm	(rejected hunks)
-@@ -311,15 +311,15 @@
- 			to_chat(user, "<font color = #666633>-% Successfully stored \ref[P.buffer] [P.buffer.name] in buffer %-</font color>")
- 		return
- 
-+	var/mob/living/mob_occupant = occupant
- 	if(W.GetID())
- 		if(!check_access(W))
- 			to_chat(user, "<span class='danger'>Access Denied.</span>")
- 			return
-		if(!(occupant || mess))
-+		if(!(mob_occupant || mess))
- 			to_chat(user, "<span class='danger'>Error: Pod has no occupant.</span>")
- 			return
- 		else
-			var/mob/living/mob_occupant
- 			connected_message("Authorized Ejection")
- 			SPEAK("An authorized ejection of [clonemind.name] has occurred.")
- 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
-@@ -395,16 +395,10 @@
- 		go_out()
- 
- /obj/machinery/clonepod/emp_act(severity)
-<<<<<<< HEAD
-	if((occupant || mess) && prob(100/(severity*efficiency)))
-		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
-		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [clonemind.name] prematurely." ,0))
-=======
-	if(isliving(occupant) && prob(100/(severity*efficiency)))
-		var/mob/living/mob_occupant = occupant
-+	var/mob/living/mob_occupant = occupant
-+	if(mob_occupant && prob(100/(severity*efficiency)))
- 		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
- 		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
->>>>>>> Changes /obj/machinery to have atom/movable occupants
- 		go_out()
- 	..()
- 
@@ -1,10 +0,0 @@
-diff a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm	(rejected hunks)
-@@ -214,7 +214,7 @@
- 	icon = 'icons/effects/fire.dmi'
- 	icon_state = "3"
- 	duration = 20
-	
-+
- /obj/effect/overlay/temp/cult
- 	randomdir = 0
- 	duration = 10