shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit/rej cleanup

Browse Source
This commit is contained in:
LetterJay
2017-05-22 11:24:17 -05:00
parent 448dc20c2b
commit 73dea85b15
8 changed files with 3 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs.dm
+1 -1
View File
@@ -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
code/datums/status_effects/debuffs.dm.rej
-10
View File
@@ -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
code/modules/mining/equipment.dm
+2 -1
View File
@@ -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)
code/modules/mining/equipment.dm.rej
-11
View File
@@ -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)