woo

2017-05-05 10:21:53 -05:00
parent d0e6790993
commit 1bb43eb7ae
8 changed files with 0 additions and 312 deletions
@@ -1,10 +0,0 @@
-diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm	(rejected hunks)
-@@ -8,7 +8,7 @@
- 	if(href_list["ahelp"])
- 		if(!check_rights(R_ADMIN))
- 			return
-		
-+
- 		var/ahelp_ref = href_list["ahelp"]
- 		var/datum/admin_help/AH = locate(ahelp_ref)
- 		if(AH)
@@ -1,10 +0,0 @@
-diff a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm	(rejected hunks)
-@@ -19,7 +19,7 @@
- 
- 	if (!msg)
- 		return
-	var/static/nicknames = world.file2list("strings/admin_nicknames.txt")
-+	var/static/nicknames = world.file2list("config/admin_nicknames.txt")
- 
- 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm	(rejected hunks)
-@@ -32,7 +32,7 @@
- 
- 	dna.species.spec_death(gibbed, src)
- 
-	if(SSticker && SSticker.mode)
-+	if(SSticker.HasRoundStarted())
- 		SSblackbox.ReportDeath(src)
- 	if(mind && mind.devilinfo)
- 		INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)
@@ -1,13 +0,0 @@
-diff a/code/modules/power/generator.dm b/code/modules/power/generator.dm	(rejected hunks)
-@@ -64,9 +64,8 @@
- 	else
- 		cut_overlays()
- 
-    var/L = min(round(lastgenlev/100000),11)
-		
-    if(L != 0)
-+		var/L = min(round(lastgenlev/100000),11)
-+		if(L != 0)
- 			add_overlay(image('icons/obj/power.dmi', "teg-op[L]"))
- 
- 		add_overlay("teg-oc[lastcirc]")