cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 08:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6565 from Mloc/bs12-fan

Browse Source 
small fixes 2
This commit is contained in:
Chinsky
2014-10-01 13:39:35 +04:00
parent a3dba06c0e ee4eafa660
commit dd9b3fe613
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm
+4 -3
View File
@@ -13,10 +13,11 @@
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(3, 0, get_turf(user))
sparks.start()
//
user.loc = pick(orange(get_turf(holder), 50))
user.Move(pick(trange(50, get_turf(holder))))
sparks = new /datum/effect/effect/system/spark_spread()
sparks.set_up(3, 0, get_turf(user))
sparks.set_up(3, 0, user.loc)
sparks.start()
/datum/artifact_effect/teleport/DoEffectAura()
code/modules/virus2/items_devices.dm
+2 -3
View File
@@ -58,12 +58,11 @@
return
..()
if(prob(50))
user << "\The [src] shatters!"
user << "<span class='danger'>\The [src] shatters!</span>"
if(virus2.infectionchance > 0)
for(var/mob/living/carbon/target in view(1, get_turf(src)))
if(airborne_can_reach(get_turf(src), get_turf(target)))
if(get_infection_chance(target))
infect_virus2(target,src.virus2)
infect_virus2(target, src.virus2)
del src
/obj/item/weapon/virusdish/examine()