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

ok this is going to be a pain in the ass ain't it (#2458)

Browse Source 
lets hope nothing blows up this time (Flags PR but it works!)
This commit is contained in:
kevinz000
2017-08-22 05:01:38 -07:00
committed by GitHub
parent 6a309b5996
commit 35b7b93b24
535 changed files with 2471 additions and 1486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/mines.dm
+1 -1
View File
@@ -130,7 +130,7 @@
new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
chainsaw.flags |= NODROP
chainsaw.flags_1 |= NODROP_1
victim.drop_all_held_items()
victim.put_in_hands(chainsaw)
chainsaw.attack_self(victim)
code/game/objects/effects/mines.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm (rejected hunks)
@@ -130,7 +130,7 @@
new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
- chainsaw.flags |= NODROP
+ chainsaw.flags_1 |= NODROP_1
victim.drop_all_held_items()
victim.put_in_hands(chainsaw)
chainsaw.attack_self(victim)
code/game/objects/effects/temporary_visuals/clockcult.dm
+2 -2
View File
@@ -86,8 +86,8 @@
transform = matrix()*2
var/matrix/M = transform
M.Turn(90)
animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)
animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL)
animate(src, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL)
/obj/effect/temp_visual/ratvar/ocular_warden
name = "warden's gaze"
code/game/objects/effects/temporary_visuals/cult.dm
+2 -2
View File
@@ -65,8 +65,8 @@
var/matrix/M = transform
M.Turn(turnedness)
transform = M
animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
animate(src, transform = oldtransform, time = duration, flags = ANIMATION_PARALLEL)
animate(src, alpha = 255, time = duration, easing = BOUNCE_EASING, flags_1 = ANIMATION_PARALLEL)
animate(src, transform = oldtransform, time = duration, flags_1 = ANIMATION_PARALLEL)
/obj/effect/temp_visual/cult/rune_spawn/rune1
icon_state = "rune1words"
code/game/objects/effects/temporary_visuals/miscellaneous.dm
+1 -1
View File
@@ -377,7 +377,7 @@
M = size_matrix*0.1
else
M = size_matrix*2
animate(src, alpha = 20, transform = M, time = duration, flags = ANIMATION_PARALLEL)
animate(src, alpha = 20, transform = M, time = duration, flags_1 = ANIMATION_PARALLEL)
/obj/effect/temp_visual/bleed/explode
icon_state = "bleed10"