Commit Graph

496 Commits

Author SHA1 Message Date
AnturK
39d25029d6 Merge pull request #15644 from ChangelingRain/youthoughtitwasdead
Revenants now have an essence HUD
2016-02-21 18:48:40 +01:00
Nerd Lord
4b7438e39f Revenants now have toggleable nightvision.
Revenants now have an essence HUD.
Revenants now retain essence cap from the previous revenant, minus perfect souls.
Restructured revenant code to be less all over the place
Moved Harvesting to revenant_abilities.dm
Defile has slightly more range, but does less damage to windows.
Blight kills shrooms and vines slightly faster.
2016-02-20 13:01:25 -05:00
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
Fox-McCloud
3da281caa8 Adjusts Laser Eyes 2016-02-12 15:40:27 -05:00
AnturK
d47b43107d Merge pull request #15405 from phil235/VisionDisposalFix
Fixes vision bug with disposal.
2016-02-11 23:25:44 +01:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
duncathan salt
aa707c13a1 Merge pull request #15138 from bgobandit/tooltips
Edited tooltip text for accuracy and grammar.
2016-02-10 21:19:57 -06:00
Cheridan
eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething
Remove borg jetpack, give them ion thrusters instead
2016-02-10 18:19:13 -06:00
phil235
34214d321a Fixes revenant not seeing itself and not having his action buttons.
Fixes many mobs having a null hud_used.
Fixes fullscreen overlay disappearing when toggling the hud.
Fixes our vision when being ejected by a delivery chute and when inside a disposal unit that is being destroyed.
2016-02-10 23:17:44 +01:00
phil235
0dd3545552 Fixes dead mob getting his fullscreen overlays to reappear when reconnecting. Dead mobs have fullscreen overlays stored in their vars but they should never see them (they're dead, they shouldn't see a flash, blurry vision, or red circles from brute damage). 2016-02-10 23:07:38 +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
AnturK
e93fbcd2a0 Cleanup 2016-02-10 16:30:43 +01:00
AnturK
a1583f24ae Buildmode Refactor
Adds generic click intercept to clients
2016-02-10 16:29:47 +01:00
Bjorn Neergaard
72fbf9a181 Fix click catcher runtime
Check that a turf exists when attempting to click it
This can happen if someone manages to click off the edge of the Z-level

The following runtime has occured 48 time(s).
runtime error: Cannot execute null.Click().
proc name: Click (/obj/screen/click_catcher/Click)
  source file: click.dm,345
  usr: Drone (758) (/mob/living/simple_animal/drone)
  src:  (/obj/screen/click_catcher)
2016-02-09 23:06:43 -06:00
Bjorn Neergaard
173387eefc Remove borg jetpack, give them ion thrusters instead
Also clean up jetpack human movement because wow that code was messy
Its still bad but its better (tm)
2016-02-09 14:53:37 -06:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06: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
Cheridan
1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
Nerd Lord
86f7b98baf Revert "Simple animal force threshold no longer converts damage to brute" 2016-02-06 17:25:44 -05:00
phil235
aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr.
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +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
fc513f9a47 Add generic "screen" capability to tgui
Also fix typo found in uplinks, random uses of 'src'
2016-02-05 17:06:05 -06:00
tkdrg
a129b1fdaf Merge pull request #15182 from ChangelingRain/complexanimals
Simple animal force threshold no longer converts damage to brute
2016-02-05 01:03:21 -03:00
Bjorn Neergaard
ac03d5f617 Fix flashlights actually stunning
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
2016-02-04 20:50:26 -06:00
Bjorn Neergaard
a5f09e103e Remove eroneous code; click catcher define; bygex path fix 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
4a3da5d77a Properly layer and set/clear fullscreen overlays
This fixes ordering issues and admin ghosting
2016-02-04 17:19:45 -06: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
Bjorn Neergaard
063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
phil235
4d63a481dd Fixes merge conflict erro (readd datum/hud/Destroy())
Fixes cyborg sight not updating when equiping/unequiping sight modules.
2016-02-04 20:43:28 +01:00
phil235
0daa87f9be More merge conflict fixes. 2016-02-04 15:48:33 +01:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
2016-02-04 14:34:45 +01:00
Nerd Lord
20b61a351c shitcoder no shitcoding 2016-02-03 21:16:56 -05:00
Nerd Lord
d412c90ba8 If we let the threshold be on by default, we cuck blob chemicals.
Let's not do that.
2016-02-03 21:10:33 -05:00
Nerd Lord
96b276cd8c not so simple now, holy shit 2016-02-03 20:43:14 -05:00
phil235
81ce777ec2 - you now only see turfs when inside gas pipes.
- I renamed some vars of datum/hud to be more selfexplanatory
- Moved all datum/hud mob code into the hud folder.
- fixed alien's zone selection button not using the correct sprites.
- I removed the update_hud() proc (that needed to be removed).
- Fixed a typo in /mob/living/carbon/ContractDisease , using "internals" instead of "internal" (very different things)
- Fixed doTeleport() calling Entered() twice on the destination area.
- To reference a mob's selected zone, you now use a direct mob var ("H.zone_selected" instead of "H.zone_sel.selecting")
- mobs lose certain screen objects var ("healths", "zone_sel", "internals", etc) which are now vars of the mob's datum/hud instead.
- the Blind spell is now done via the blind mutation instead of the blind disabilities.
- Give to mobs a version of forceMove(), so the mob is always properly unbuckled, his pull stopped, his vision updated, etc.
- The "user" var of mob/camera/aiEye/remote is renamed to "eye_user" to avoid confusion.
- reset_view() is replaced by reset_perspective(). Now all changes to client.eye and client.perspective are done with this proc.
- I reworked /obj/machinery/computer/security code, changing camera is instantaneous now, as well as cancelling.
- I reworked /obj/machinery/computer/camera_advanced code as well.
- I changed /obj/item/mecha_parts/mecha_equipment/mining_scanner's meson view to be constant instead of by intermittent.
- Fixes not being able to use /obj/item/device/camera_bug while buckled.
- removed admin_forcemove() proc, admin force moving now uses forceMove() simply.
- Removed the client var "adminobs"
- Added var/vision_correction to glasses.
- Added a thermal_overload() proc for glasses, to remove copypasta in emp_act code.
- Remove the hal_crit mob var
- We no longer delete the mob's hud everytime he logs in.
- Added a stat == dead check in mob's metabolize() so we immediately stop metabolizing if one of the chem kills the mob.
- Being inside disposal bin lowers your vision, like wearing a welding helmet.
- removed the remote_view mob var.
- I changed advanced camera EYE, some fixes, removed unnecessary code when the eye moves, now the mob client eye properly follows the camera mob.
- fixes mob var "machine" not being nullified on logout.
- larva/death() was calling two "living_mob_list -= src"
- I made the Blind screen objects into a global_hud instead of giving one to each mob (like damage overlay).
- I untied tint and eye_blind, TINT_BLIND doesn't give you eye_blind=1.
- gave a visual overlay when inside locker (vimpaired)
- when inside disposal/gas pipes you get sight |= (BLIND|SEE_TURFS)
- glasses toggling updates (atmos meson toggle): DONE
- The new adjust procs serve to properly change eye_blind etc and call vision update procs when needed.
- I added an on_unset_machine() proc to handle perspective reset for camera consoles.
- I moved consequences of eye_check fail inside eye_check() procs themselves.
- I fixed vision updates being fucked by forceMove, especially pipe vision.
- I decided that damage overlay not appearing when dead.
- mob's hud_used is no longer deleted on each login()
- I refactored mob huds a bit, creating subtypes for each mob (/datum/hud/human)
- f12's hud toggling is now available to all mobs
- gave borgs a low_power_mode var so unpowered borg do not use stat= UNCONSCIOUS (which made things weird since you were unconscious but not blind)
- Fixed double Area entering when forced teleporting.
- I fixed larva pulling not being broken when cuffing them, and larva not seeing handcuff alert (and they can resist by clicking it)
- I removed pull updates from life() since it onyl checked for puller's incapacitation.
- I renamed camera/deactivate() to toggle_cam() to be more accurate.
- I fixed mmi brain being immortal (by removing the brain and putting it back)
- I simplified mmi brain emp damage.
2016-02-04 00:33:16 +01:00
bgobandit
ea196989b4 moar editing 2016-02-01 18:30:35 -05:00
bgobandit
d2d57957d7 Edited tooltip text. 2016-02-01 17:40:43 -05:00
Razharas
ad5172a839 Merge pull request #14989 from ChangelingRain/holoclarity
Holoparasites have a health hud display for the summoner's health
2016-01-29 20:20:25 +03:00
Razharas
0826128459 Merge pull request #14698 from Firecage/absolutepathsandifs
Absolute paths and changes one liner if's/else's/else if's.
2016-01-29 03:15:12 +03:00
tkdrg
748331b4d1 Merge pull request #14978 from KorPhaeron/alien_surgery
Fixes alien surgery
2016-01-28 18:47:34 -03:00
Nerd Lord
d492db3e58 useful commit message here 2016-01-28 12:50:38 -05:00
Nerd Lord
cdcf4dbc26 Holoparasites have a health hud display for the summoner's health, as a percentage.
Adds glows when holoparasites force-recall to their summoner
2016-01-27 21:32:22 -05:00
KorPhaeron
6761eeac43 Fixes alien surgery 2016-01-27 14:17:42 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Razharas
41a9a90947 Merge pull request #14921 from MrPerson/hud_garbage_collection
Make /datum/hud garbage collect correctly
2016-01-27 07:19:42 +03:00
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509
Byond509
2016-01-26 01:57:42 -06:00
MrPerson
5c0992f8a6 Make /datum/hud garbage collect correctly
For Dec. 21st:
The following path has failed to GC 739 time(s).
Path : /datum/hud
2016-01-25 20:32:04 -08:00
Bjorn Neergaard
014e83fec6 Fix tgui machine interactions status checks 2016-01-25 12:03:02 -06:00
Remie Richards
94f1b51893 Renames appearance flag defines. 2016-01-24 23:26:14 -06:00
Remie Richards
86c53d2450 Screen objects now ignore everything except alpha, they probably wouldn't be affected anyways, but safety. 2016-01-24 23:22:13 -06:00