CPTANT
086dd558f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire
...
# Conflicts:
# code/game/gamemodes/malfunction/Malf_Modules.dm
2016-02-16 03:23:55 +01:00
phil235
961331d00a
Fixes ethereal jaunt not updating your perspective at the end.
2016-02-14 19:29:34 +01:00
phil235
02d5d24daa
Fixes Malfpowwer upgrade camera net not giving the AI nightvision
...
Fixes client eye not being update when using shadow walk or ethereal_jaunt inside a container.
Fixes thrall vision spell not udating your vision.
Fixes Shift Nerves shadowling ability not adjusting your night vision range correctly.
Using shadow walk now extinguishes the shadowling.
2016-02-13 01:17:21 +01:00
phil235
0291f450d2
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/death.dm
code/modules/mob/living/login.dm
code/modules/mob/mob.dm
2016-02-10 22:35:19 +01:00
Incoming
0b54a68e22
fixes some kaze demands and fixes "conflicts" due to file moves.
2016-02-08 22:34:44 -05:00
Incoming
6ef82fd642
Merge branch 'master' of https://github.com/tgstation/-tg-station into animorphs_speedrun
2016-02-08 22:26:00 -05:00
phil235
83633edfed
- I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
...
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
phil235
fdec37b76f
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
...
Conflicts:
code/_onclick/hud/alien.dm
code/_onclick/hud/alien_larva.dm
code/_onclick/hud/hud.dm
code/_onclick/hud/human.dm
code/_onclick/hud/monkey.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/robot.dm
code/game/machinery/Sleeper.dm
code/modules/mob/living/carbon/alien/larva/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/species.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/death.dm
code/modules/mob/living/life.dm
code/modules/mob/living/silicon/ai/death.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/ai/login.dm
code/modules/mob/living/silicon/pai/death.dm
code/modules/mob/living/silicon/robot/death.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
Bjorn Neergaard
7a47b43c53
Re-implement screen overlays
...
This fixes 510 showing all overlays in the rightclick menu
2016-02-04 17:19:44 -06:00
phil235
16d0154d9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
2016-02-04 17:04:10 +01:00
Firecage
dbc744d9ee
Moves the code for spells to the Modules section.
2016-02-01 19:33:44 +02:00
