rej cleanup

2017-05-17 03:50:34 -05:00
parent 3516852582
commit f978e3d56e
20 changed files with 0 additions and 531 deletions
@@ -1,10 +0,0 @@
-diff a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm	(rejected hunks)
-@@ -33,4 +33,8 @@
- #define STATUS_EFFECT_SIGILMARK /datum/status_effect/sigil_mark
- #define STATUS_EFFECT_BELLIGERENT /datum/status_effect/belligerent //forces the affected to walk, doing damage if they try to run
- 
-+#define STATUS_EFFECT_MANIAMOTOR /datum/status_effect/maniamotor //disrupts, damages, and confuses the affected as long as they're in range of the motor
-+#define MAX_MANIA_SEVERITY 100 //how high the mania severity can go
-+#define MANIA_DAMAGE_TO_CONVERT 90 //how much damage is required before it'll convert affected targets
-+
- #define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.
@@ -1,66 +0,0 @@
-diff a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm	(rejected hunks)
-@@ -489,41 +490,38 @@
- 	var/time_passed = world.time
- 	var/list/yes_voters = new
- 	var/list/cult_total = new
-	if(world.time<1800)
-		Nominee << "It would be premature to select a leader while everyone is still settling in, try again in [round((1800-world.time)/10)] seconds"
-+	if(world.time < CULT_POLL_WAIT)
-+		Nominee << "It would be premature to select a leader while everyone is still settling in, try again in [round((CULT_POLL_WAIT-world.time)/10)] seconds"
- 		return
- 	for(var/datum/mind/B in SSticker.mode.cult)
-		if(!isliving(B.current))
-			continue
- 		var/mob/living/M = B.current
-		if(isliving(M))
-+		if(!M.incapacitated())
- 			M << 'sound/hallucinations/im_here1.ogg'
- 			M.verbs -= /mob/living/proc/cult_master
- 			to_chat(M, "<span class='cultlarge'>Acolyte [Nominee] has asserted that they are worthy of leading the cult. A vote will be called shortly.</span>")
- 	sleep(250)
- 	for(var/datum/mind/B in SSticker.mode.cult)
-		if(!isliving(B.current))
-			continue
- 		var/mob/living/M = B.current
-		M << 'sound/magic/exit_blood.ogg'
-		switch(askuser(M,"[Nominee] seeks to lead your cult, do you support  them?","Please answer in 20 seconds!","Yes","No","Abstain", StealFocus=0, Timeout=200))
-			if(1)
-				if((world.time-time_passed)>500)
-					M << "<span class='danger'>Sorry, your vote came too late!</span>"
-					M << 'sound/machines/buzz-sigh.ogg'
-				else
-					M << "<span class='notice'>Choice registered: Yes.</span>"
-					yes_voters += M
-					cult_total += M
-			if(2)
-				if((world.time-time_passed)>500)
-					M << "<span class='danger'>Sorry, your vote came too late!</span>"
-					M << 'sound/machines/buzz-sigh.ogg'
-				else
-					M << "<span class='danger'>Choice registered: No.</span>"
-					cult_total += M
-			if(3)
-				M << "<span class='danger'>Choice registered: Abstain.</span>"
-+		if(!M.incapacitated())
-+			M << 'sound/magic/exit_blood.ogg'
-+			switch(askuser(M,"[Nominee] seeks to lead your cult, do you support  them?","Please answer in 20 seconds!","Yes","No","Abstain", StealFocus=0, Timeout=200))
-+				if(1)
-+					if((world.time-time_passed)>500)
-+						to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
-+						M << 'sound/machines/buzz-sigh.ogg'
-+					else
-+						M << "<span class='notice'>Choice registered: Yes.</span>"
-+						yes_voters += M
-+						cult_total += M
-+				if(2)
-+					if((world.time-time_passed)>500)
-+						to_chat(M, "<span class='danger'>Sorry, your vote came too late!</span>")
-+						M << 'sound/machines/buzz-sigh.ogg'
-+					else
-+						to_chat(M, "<span class='danger'>Choice registered: No.</span>")
-+						cult_total += M
-+				if(3)
-+					to_chat(M, "<span class='danger'>Choice registered: Abstain.</span>")
- 	sleep(300)
- 	if(yes_voters.len > (cult_total.len/2))
- 		var/datum/action/innate/cultmast/finalreck/FinalReckoning = new()
@@ -1,9 +0,0 @@
-diff a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm	(rejected hunks)
-@@ -65,6 +65,7 @@
- 	cult_memorization(owner)
- 	if(jobban_isbanned(current, ROLE_CULTIST))
- 		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_CULTIST, ROLE_CULTIST), 0)
-+	SSticker.mode.update_cult_icons_added(owner)
- 	current.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
- 	current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
- 
@@ -1,75 +0,0 @@
-diff a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm	(rejected hunks)
-@@ -108,20 +108,6 @@
- 			to_chat(owner, "<span class='sevtug[span_part]'>You feel a frustrated voice quietly fade from your mind...</span>")
- 		qdel(src)
- 		return
-	if(!(owner in viewers(7, motor))) //not being in range makes it fall off much faster
-		if(!is_servant && !warned_outofsight)
-			to_chat(owner, "<span class='sevtug[span_part]'>\"[text2ratvar(pick(flee_messages))]\"</span>")
-			warned_outofsight = TRUE
-		if(severity)
-			severity--
-			if(!severity)
-				qdel(src)
-				return
-		else
-			qdel(src)
-			return
-	else if(prob(severity * 2))
-		warned_outofsight = FALSE
- 	if(!motor.active) //it being off makes it fall off much faster
- 		if(!is_servant && !warned_turnoff)
- 			if(motor.total_accessable_power() > motor.mania_cost)
-@@ -129,20 +115,24 @@
- 			else
- 				to_chat(owner, "<span class='sevtug[span_part]'>[text2ratvar(pick(powerloss_messages))]</span>")
- 			warned_turnoff = TRUE
-		if(severity)
-			severity--
-+		severity = max(severity - 2, 0)
-+		if(!severity)
-+			qdel(src)
-+			return
-+	else
-+		if(prob(severity * 2))
-+			warned_turnoff = FALSE
-+		if(!(owner in viewers(7, motor))) //not being in range makes it fall off slightly faster
-+			if(!is_servant && !warned_outofsight)
-+				to_chat(owner, "<span class='sevtug[span_part]'>\"[text2ratvar(pick(flee_messages))]\"</span>")
-+				warned_outofsight = TRUE
-+			severity = max(severity - 1, 0)
- 			if(!severity)
- 				qdel(src)
- 				return
-		else
-			qdel(src)
-			return
-	else if(prob(severity * 2))
-		warned_turnoff = FALSE
-+		else if(prob(severity * 2))
-+			warned_outofsight = FALSE
- 	if(is_servant) //heals servants of braindamage, hallucination, druggy, dizziness, and confusion
-		var/brainloss = owner.getBrainLoss()
-		if(brainloss)
-			owner.adjustBrainLoss(-brainloss)
- 		if(owner.hallucination)
- 			owner.hallucination = 0
- 		if(owner.druggy)
-@@ -163,14 +153,12 @@
- 			if(prob(severity * 0.15))
- 				to_chat(owner, "<span class='sevtug[span_part]'>\"[text2ratvar(pick(mania_messages))]\"</span>")
- 			owner.playsound_local(get_turf(motor), hum, severity, 1)
-			if(owner.getBrainLoss() <= 50)
-				owner.adjustBrainLoss(severity * 0.025) //2.5% of severity per second
- 			owner.adjust_drugginess(Clamp(max(severity * 0.075, 1), 0, max(0, 50 - owner.druggy))) //7.5% of severity per second, minimum 1
- 			if(owner.hallucination < 50)
- 				owner.hallucination = min(owner.hallucination + max(severity * 0.075, 1), 50) //7.5% of severity per second, minimum 1
-			if(owner.dizziness < 25)
-				owner.dizziness = min(owner.dizziness + Floor(severity * 0.025), 25) //2.5% of severity per second above 20 severity
-+			if(owner.dizziness < 50)
-+				owner.dizziness = min(owner.dizziness + round(severity * 0.05, 1), 50) //5% of severity per second above 10 severity
- 			if(owner.confused < 25)
-				owner.confused = min(owner.confused + Floor(severity * 0.025), 25) //2.5% of severity per second above 20 severity
-+				owner.confused = min(owner.confused + round(severity * 0.025, 1), 25) //2.5% of severity per second above 20 severity
- 			owner.adjustToxLoss(severity * 0.02, TRUE, TRUE) //2% of severity per second
- 		severity--
@@ -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
@@ -1,55 +0,0 @@
-diff a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm	(rejected hunks)
-@@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	for(var/I in l2b)
- 		var/datum/admin_help/AH = I
- 		dat += "<span class='adminnotice'><span class='adminhelp'>Ticket #[AH.id]</span>: <A HREF='?_src_=holder;ahelp=\ref[AH];ahelp_action=ticket'>[AH.initiator_key_name]: [AH.name]</A></span><br>"
-		
-+
- 	usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480")
- 
- //Tickets statpanel
-@@ -253,7 +253,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	if(state == AHELP_ACTIVE)
- 		to_chat(usr, "<span class='warning'>This ticket is already open.</span>")
- 		return
-	
-+
- 	if(GLOB.ahelp_tickets.CKey2ActiveTicket(initiator_ckey))
- 		to_chat(usr, "<span class='warning'>This user already has an active ticket, cannot reopen this one.</span>")
- 		return
-@@ -310,7 +310,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 	RemoveActive()
- 	state = AHELP_RESOLVED
- 	GLOB.ahelp_tickets.ListInsert(src)
-	
-+
- 	if(initiator)
- 		initiator.giveadminhelpverb()
- 
-@@ -325,7 +325,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- /datum/admin_help/proc/Reject(key_name = key_name_admin(usr))
- 	if(state != AHELP_ACTIVE)
- 		return
-	
-+
- 	if(initiator)
- 		initiator.giveadminhelpverb()
- 
-@@ -494,7 +494,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 
- 	if(!check_rights(R_ADMIN, TRUE))
- 		return
-	
-+
- 	var/browse_to
- 
- 	switch(input("Display which ticket list?") as null|anything in list("Active Tickets", "Closed Tickets", "Resolved Tickets"))
-@@ -506,7 +506,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
- 			browse_to = AHELP_RESOLVED
- 		else
- 			return
-	
-+
- 	GLOB.ahelp_tickets.BrowseTickets(browse_to)
- 
- //
@@ -1,12 +0,0 @@
-diff a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm	(rejected hunks)
-@@ -108,8 +108,8 @@
- 	for(var/mob/M in view(range,A))
- 		to_chat(M, msg)
- 
-	log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]")
-	message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[A.x];Y=[A.y];Z=[A.z]'>[get_area(A)]</a>):</b> [msg]<BR></span>")
-+	log_admin("LocalNarrate: [key_name(usr)] at [get_area(A)][COORD(A)]: [msg]")
-+	message_admins("<span class='adminnotice'><b> LocalNarrate: [key_name_admin(usr)] at [get_area(A)][ADMIN_JMP(A)]:</b> [msg]<BR></span>")
- 	SSblackbox.add_details("admin_verb","Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- 
- /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
@@ -1,12 +0,0 @@
-diff a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm	(rejected hunks)
-@@ -110,8 +110,8 @@
- 		return
- 	var/datum/gas_mixture/air1 = AIR1
- 	var/turf/T = get_turf(src)
-	if(isliving(occupant))
-		var/mob/living/mob_occupant
-+	if(occupant)
-+		var/mob/living/mob_occupant = occupant
- 		if(mob_occupant.health >= 100) // Don't bother with fully healed people.
- 			on = FALSE
- 			update_icon()
@@ -1,46 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -266,17 +266,11 @@ GLOBAL_LIST(external_rsc_urls)
- 		if((global.comms_key == "default_pwd" || length(global.comms_key) <= 6) && global.comms_allowed) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
- 			to_chat(src, "<span class='danger'>The server's API key is either too short or is the default value! Consider changing it immediately!</span>")
- 
-	add_verbs_from_config()
-+	add_verbs_from_config(tdata)
- 	set_client_age_from_db()
- 	var/cached_player_age = player_age //we have to cache this because other shit may change it and we need it's current value now down below.
- 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
-		player_age = 0	
-	if(!IsGuestKey(key) && SSdbcore.IsConnected())
-		findJoinDate()
-
-	sync_client_with_db(tdata)
-	
-	
-+		player_age = 0
- 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
- 		if (config.panic_bunker && !holder && !(ckey in GLOB.deadmins))
- 			log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
-@@ -295,7 +289,14 @@ GLOBAL_LIST(external_rsc_urls)
- 				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
- 	else if (isnum(cached_player_age) && cached_player_age < config.notify_new_player_age)
- 		message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age==1?"":"s")]")
-	
-+	if(config.use_account_age_for_jobs && account_age >= 0)
-+		player_age = account_age
-+	if(account_age >= 0 && account_age < config.notify_new_player_account_age)
-+		message_admins("[key_name_admin(src)] (IP: [address], ID: [computer_id]) is a new BYOND account day[(account_age==1?"":"s")] old, created on [account_join_date].")
-+		if (config.irc_first_connection_alert)
-+			send2irc_adminless_only("new_byond_user", "[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account day[(account_age==1?"":"s")] old, created on [account_join_date].")
-+	else //We failed to get an age for this user, let admins know they need to keep an eye on them
-+		message_admins("Failed to get BYOND account age for [key_name_admin(src)]")
- 	get_message_output("watchlist entry", ckey)
- 	check_ip_intel()
- 
-@@ -340,7 +341,7 @@ GLOBAL_LIST(external_rsc_urls)
- 		adminGreet(1)
- 		holder.owner = null
- 		GLOB.admins -= src
-	
-+
- 	GLOB.ahelp_tickets.ClientLogout(src)
- 	GLOB.directory -= ckey
- 	GLOB.clients -= src
@@ -1,9 +0,0 @@
-diff a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm	(rejected hunks)
-@@ -5,6 +5,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
- /mob/dead/Initialize()
- 	if(initialized)
- 		stack_trace("Warning: [src]([type]) initialized multiple times!")
-+	initialized = TRUE
- 	tag = "mob_[next_mob_id++]"
- 	GLOB.mob_list += src
- 
@@ -1,33 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
-@@ -173,14 +173,18 @@
- 	if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype)
- 		C.dna.blood_type = exotic_bloodtype
- 
-+	if(old_species.mutanthands)
-+		for(var/obj/item/I in C.held_items)
-+			if(istype(I, old_species.mutanthands))
-+				qdel(I)
-+
- 	if(mutanthands)
- 		// Drop items in hands
- 		// If you're lucky enough to have a NODROP item, then it stays.
- 		for(var/V in C.held_items)
- 			var/obj/item/I = V
- 			if(istype(I))
-				if(C.dropItemToGround(I))
-					C.put_in_hands(new mutanthands())
-+				C.dropItemToGround(I)
- 			else	//Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand
- 				C.put_in_hands(new mutanthands())
- 
-@@ -189,10 +193,6 @@
- 		C.dna.blood_type = random_blood_type()
- 	if(DIGITIGRADE in species_traits)
- 		C.Digitigrade_Leg_Swap(TRUE)
-	if(mutanthands)
-		for(var/obj/item/I in C.held_items)
-			if(istype(I, mutanthands))
-				qdel(I)
- 
- /datum/species/proc/handle_hair(mob/living/carbon/human/H, forced_colour)
- 	H.remove_overlay(HAIR_LAYER)
@@ -1,40 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm	(rejected hunks)
-@@ -41,14 +41,11 @@
- 	for(var/spell in construct_spells)
- 		AddSpell(new spell(null))
- 
-<<<<<<< HEAD
- /mob/living/simple_animal/hostile/construct/Destroy()
- 	for(var/X in actions)
- 		var/datum/action/A = X
- 		qdel(A)
- 	..()
-=======
->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
- 
- /mob/living/simple_animal/hostile/construct/Login()
- 	..()
-@@ -288,8 +285,6 @@
- 	environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP
- 
- 
-
-<<<<<<< HEAD
- ///////////////////////Master-Tracker///////////////////////
- 
- /datum/action/innate/seek_master
-@@ -320,7 +315,7 @@
- 		the_construct.seeking = TRUE
- 		to_chat(the_construct, "<span class='cultitalic'>You are now tracking your master.</span>")
- 
-=======
-+
- /////////////////////////////ui stuff/////////////////////////////
- 
- /mob/living/simple_animal/hostile/construct/update_health_hud()
-@@ -337,4 +332,4 @@
- 			hud_used.healths.icon_state = "[icon_state]_health5"
- 		else
- 			hud_used.healths.icon_state = "[icon_state]_health6"
->>>>>>> a7603e4aba50d410795d5207e6d5e929b2401cb9
-+
@@ -1,22 +0,0 @@
-diff a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm	(rejected hunks)
-@@ -303,17 +303,17 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
- 	use_power = on ? 2 : 1
- 	// Sound the alert if gravity was just enabled or disabled.
- 	var/alert = 0
-	var/area/area = get_area(src)
-+	var/area/A = get_area(src)
- 	if(on && SSticker.IsRoundInProgress()) // If we turned on and the game is live.
- 		if(gravity_in_level() == 0)
- 			alert = 1
- 			investigate_log("was brought online and is now producing gravity for this level.", "gravity")
-			message_admins("The gravity generator was brought online. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
-+			message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
- 	else
- 		if(gravity_in_level() == 1)
- 			alert = 1
- 			investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
-			message_admins("The gravity generator was brought offline with no backup generator. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
-+			message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
- 
- 	update_icon()
- 	update_list()
@@ -1,15 +0,0 @@
-diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm	(rejected hunks)
-@@ -98,9 +98,10 @@
- 
- /obj/machinery/power/emitter/Destroy()
- 	if(SSticker && SSticker.IsRoundInProgress())
-		message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Emitter deleted at ([x],[y],[z])")
-		investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
-+		var/turf/T = get_turf(src)
-+		message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
-+		log_game("Emitter deleted at [COORD(T)]")
-+		investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]","singulo")
- 	QDEL_NULL(sparks)
- 	return ..()
- 
@@ -1,17 +0,0 @@
-diff a/code/modules/power/smes.dm b/code/modules/power/smes.dm	(rejected hunks)
-@@ -192,10 +192,11 @@
- 
- /obj/machinery/power/smes/Destroy()
- 	if(SSticker && SSticker.IsRoundInProgress())
-		var/area/area = get_area(src)
-		message_admins("SMES deleted at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
-		log_game("SMES deleted at ([area.name])")
-		investigate_log("<font color='red'>deleted</font> at ([area.name])","singulo")
-+		var/area/A = get_area(src)
-+		var/turf/T = get_turf(src)
-+		message_admins("SMES deleted at [A][ADMIN_JMP(T)]")
-+		log_game("SMES deleted at [A][COORD(T)]")
-+		investigate_log("<font color='red'>deleted</font> at [A][COORD(T)]","singulo")
- 	if(terminal)
- 		disconnect_terminal()
- 	return ..()
@@ -1,10 +0,0 @@
-diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm	(rejected hunks)
-@@ -13,7 +13,7 @@
- 	. = ..()
- 	languages_possible = typecacheof(list(
- 		/datum/language/common,
-		/datum/language/unathi,
-+		/datum/language/draconic,
- 		/datum/language/monkey,
- 		/datum/language/ratvar
- 	))