commit/rej cleanup

2017-05-22 11:24:17 -05:00
parent 448dc20c2b
commit 73dea85b15
8 changed files with 3 additions and 89 deletions
@@ -169,7 +169,7 @@
 	alert_type = null
 /datum/status_effect/crusher_mark
 	id = "crusher_mark"
-	duration = 600 //if you leave for a minute you lose the mark, deal with it
+	duration = 30 //if you leave for 30 seconds you lose the mark, deal with it
 	status_type = STATUS_EFFECT_REPLACE
 	alert_type = null
 	var/mutable_appearance/marked_underlay
@@ -1,10 +0,0 @@
-diff a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm	(rejected hunks)
-@@ -170,7 +170,7 @@
- 
- /datum/status_effect/crusher_mark
- 	id = "crusher_mark"
-	duration = 600 //if you leave for a minute you lose the mark, deal with it
-+	duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
- 	status_type = STATUS_EFFECT_REPLACE
- 	alert_type = null
- 	var/mutable_appearance/marked_underlay
@@ -556,7 +556,8 @@
 		return
 	if(proximity_flag && isliving(target))
 		var/mob/living/L = target
-		if(!L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK))
+		var/datum/status_effect/crusher_mark/CM = L.has_status_effect(STATUS_EFFECT_CRUSHERMARK)
+		if(!CM || CM.hammer_synced != src || !L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK))
 			return
 		new /obj/effect/overlay/temp/kinetic_blast(get_turf(L))
 		var/backstab_dir = get_dir(user, L)
@@ -1,11 +0,0 @@
-diff a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm	(rejected hunks)
-@@ -549,7 +556,8 @@
- 		return
- 	if(proximity_flag && isliving(target))
- 		var/mob/living/L = target
-		if(!L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK))
-+		var/datum/status_effect/crusher_mark/CM = L.has_status_effect(STATUS_EFFECT_CRUSHERMARK)
-+		if(!CM || CM.hammer_synced != src || !L.remove_status_effect(STATUS_EFFECT_CRUSHERMARK))
- 			return
- 		new /obj/effect/temp_visual/kinetic_blast(get_turf(L))
- 		var/backstab_dir = get_dir(user, L)
@@ -1,10 +0,0 @@
-diff a/config/game_options.txt b/config/game_options.txt	(rejected hunks)
-@@ -482,7 +482,7 @@ Space_Budget 16
- #Must be at least 30 to not break parallax I recommended at least 55 to be visually/aurally appropriate
- ARRIVALS_SHUTTLE_DOCK_WINDOW 55
- 
-#Set this to 1 to prevent late join players from spawning if the arrivals shuttle is depressurized
-+#Uncomment to prevent late join players from spawning if the arrivals shuttle is depressurized
- #ARRIVALS_SHUTTLE_REQUIRE_SAFE_LATEJOIN
- 
- # How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets.
@@ -1,16 +0,0 @@
-diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
-@@ -677,10 +677,10 @@
- #include "code\game\objects\effects\decals\decal.dm"
- #include "code\game\objects\effects\decals\misc.dm"
- #include "code\game\objects\effects\decals\remains.dm"
-#include "code\game\objects\effects\decals\Cleanable\aliens.dm"
-#include "code\game\objects\effects\decals\Cleanable\humans.dm"
-#include "code\game\objects\effects\decals\Cleanable\misc.dm"
-#include "code\game\objects\effects\decals\Cleanable\robots.dm"
-+#include "code\game\objects\effects\decals\cleanable\aliens.dm"
-+#include "code\game\objects\effects\decals\cleanable\humans.dm"
-+#include "code\game\objects\effects\decals\cleanable\misc.dm"
-+#include "code\game\objects\effects\decals\cleanable\robots.dm"
- #include "code\game\objects\effects\effect_system\effect_system.dm"
- #include "code\game\objects\effects\effect_system\effects_explosion.dm"
- #include "code\game\objects\effects\effect_system\effects_foam.dm"