cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

-Eye lasers will hit people who are lying down.

Browse Source 
-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:
giacomand@gmail.com
2012-11-13 19:34:45 +00:00
parent 50fbfa0c35
commit b54bc843ba
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/atoms.dm
View File

@@ -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 ------- // ------- 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) 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 ------- // ------- 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/T = get_turf(usr)
var/turf/U = get_turf(src) var/turf/U = get_turf(src)
if(istype(src, /turf)) oloc = src
else
oloc = loc
if(istype(usr, /mob/living/carbon/human)) if(istype(usr, /mob/living/carbon/human))
usr:nutrition -= rand(1,5) 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.firer = usr
A.def_zone = usr:get_organ_target() A.def_zone = usr:get_organ_target()
A.original = oloc A.original = src
A.current = T A.current = T
A.yo = U.y - T.y A.yo = U.y - T.y
A.xo = U.x - T.x A.xo = U.x - T.x

2
code/game/machinery/wishgranter.dm
View File

@@ -56,6 +56,8 @@
if(!(HEAL in user.mutations)) if(!(HEAL in user.mutations))
user.mutations.Add(HEAL) user.mutations.Add(HEAL)
user.update_mutations()
ticker.mode.traitors += user.mind ticker.mode.traitors += user.mind
user.mind.special_role = "Avatar of the Wish Granter" user.mind.special_role = "Avatar of the Wish Granter"

4
code/modules/mob/living/living.dm
View File

@@ -260,6 +260,8 @@
/mob/living/proc/revive() /mob/living/proc/revive()
setToxLoss(0) setToxLoss(0)
setOxyLoss(0) setOxyLoss(0)
setCloneLoss(0)
setBrainLoss(0)
SetParalysis(0) SetParalysis(0)
SetStunned(0) SetStunned(0)
SetWeakened(0) SetWeakened(0)
@@ -276,6 +278,8 @@
heal_overall_damage(1000, 1000) heal_overall_damage(1000, 1000)
buckled = initial(src.buckled) buckled = initial(src.buckled)
handcuffed = initial(src.handcuffed) handcuffed = initial(src.handcuffed)
for(var/datum/disease/D in viruses)
D.cure(0)
if(stat == 2) if(stat == 2)
dead_mob_list -= src dead_mob_list -= src
living_mob_list += src living_mob_list += src

4
code/modules/power/singularity/singularity.dm
View File

@@ -302,10 +302,10 @@ var/global/list/uneatable = list(
if(target && prob(60)) if(target && prob(60))
movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one movement_dir = get_dir(src,target) //moves to a singulo beacon, if there is one
else if(!(movement_dir in cardinal)) 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) 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) L.Remove(last_failed_movement)
movement_dir = pick(L) movement_dir = pick(L)