mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 02:16:05 +00:00
-Eye lasers will hit people who are lying down.
-After using the wish granter it will update your mutation icons. -Rejuv will now heal clone damage and brain damage. -Changed the order of possible directions the singularity can go in so that it won't go south too often (in theory). git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5057 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1216,12 +1216,10 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
|
||||
// ------- YOU ARE CLICKING ON AN OBJECT THAT'S INACCESSIBLE TO YOU AND IS NOT YOUR HUD -------
|
||||
if((LASER in usr:mutations) && usr:a_intent == "hurt" && world.time >= usr.next_move)
|
||||
// ------- YOU HAVE THE LASER MUTATION, YOUR INTENT SET TO HURT AND IT'S BEEN MORE THAN A DECISECOND SINCE YOU LAS TATTACKED -------
|
||||
var/turf/oloc
|
||||
|
||||
var/turf/T = get_turf(usr)
|
||||
var/turf/U = get_turf(src)
|
||||
if(istype(src, /turf)) oloc = src
|
||||
else
|
||||
oloc = loc
|
||||
|
||||
|
||||
if(istype(usr, /mob/living/carbon/human))
|
||||
usr:nutrition -= rand(1,5)
|
||||
@@ -1234,7 +1232,7 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
|
||||
|
||||
A.firer = usr
|
||||
A.def_zone = usr:get_organ_target()
|
||||
A.original = oloc
|
||||
A.original = src
|
||||
A.current = T
|
||||
A.yo = U.y - T.y
|
||||
A.xo = U.x - T.x
|
||||
|
||||
@@ -56,6 +56,8 @@
|
||||
if(!(HEAL in user.mutations))
|
||||
user.mutations.Add(HEAL)
|
||||
|
||||
user.update_mutations()
|
||||
|
||||
ticker.mode.traitors += user.mind
|
||||
user.mind.special_role = "Avatar of the Wish Granter"
|
||||
|
||||
|
||||
@@ -260,6 +260,8 @@
|
||||
/mob/living/proc/revive()
|
||||
setToxLoss(0)
|
||||
setOxyLoss(0)
|
||||
setCloneLoss(0)
|
||||
setBrainLoss(0)
|
||||
SetParalysis(0)
|
||||
SetStunned(0)
|
||||
SetWeakened(0)
|
||||
@@ -276,6 +278,8 @@
|
||||
heal_overall_damage(1000, 1000)
|
||||
buckled = initial(src.buckled)
|
||||
handcuffed = initial(src.handcuffed)
|
||||
for(var/datum/disease/D in viruses)
|
||||
D.cure(0)
|
||||
if(stat == 2)
|
||||
dead_mob_list -= src
|
||||
living_mob_list += src
|
||||
|
||||
@@ -302,10 +302,10 @@ var/global/list/uneatable = list(
|
||||
if(target && prob(60))
|
||||
movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
|
||||
else if(!(movement_dir in cardinal))
|
||||
movement_dir = pick(NORTH, SOUTH, EAST, WEST)
|
||||
movement_dir = pick(NORTH, EAST, WEST, SOUTH)
|
||||
|
||||
if(movement_dir == last_failed_movement)
|
||||
var/list/L = new/list(NORTH, SOUTH, EAST, WEST)
|
||||
var/list/L = new/list(NORTH, EAST, WEST, SOUTH)
|
||||
L.Remove(last_failed_movement)
|
||||
movement_dir = pick(L)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user