Commit Graph

1057 Commits

Author SHA1 Message Date
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 b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard 29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -06:00
xxalpha 68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha 3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00: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
xxalpha cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00
KorPhaeron 8d4351fd04 Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue" 2016-02-03 22:03:22 -06: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
Razharas 6dd29e1211 Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
2016-02-02 01:02:17 +03:00
tkdrg a0f7d7afe1 Merge pull request #14999 from KorPhaeron/AI_buffs
AI upgrade software
2016-01-30 10:50:05 -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
Bjorn Neergaard f93822c195 Allow tgui input() to be 0, fix SMES components
Fixes #14965
2016-01-28 07:10:37 -06:00
KorPhaeron 00f84f74ea AI upgrade software 2016-01-28 00:44:45 -06:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard d9162b653c Fix tgui recursion being broken
..() is more elegant after all... You win @RemieRichards
Fixes #14925
2016-01-27 00:52:22 -06:00
Razharas d110b5fc59 Merge pull request #14882 from ChangelingRain/superfailed
Actually fixes supermatter explosion to not be capped
2016-01-27 04:16:20 +03:00
Bjorn Neergaard 961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Nerd Lord 8131d9e5b1 i forgot what to set the var to between looking at the proc and looking back at supermatter 2016-01-24 22:33:16 -05:00
tkdrg dc0e8f7b5c Merge pull request #14817 from duncathan/lastmos
Adds mapping freedom to the TEG
2016-01-24 15:15:48 -03:00
duncathan salt 14befdc1e8 Merge pull request #14807 from Razharas/UltimateFix
For real fixes smeses charge on construction
2016-01-24 10:07:00 -06:00
Razharas b9eacbaf4a Merge pull request #14794 from ChangelingRain/superbombing
Fixes supermatter explosion being capped
2016-01-24 16:54:40 +03:00
duncathan 143352e506 fucking birdboat 2016-01-23 13:14:07 -06:00
duncathan 07bb3775e6 adds mapping freedom to the TEG 2016-01-23 12:25:42 -06:00
Razharas d6ddcf6b4c For real fixes smeses charge on construction
For real fixes smeses charge on construction
Fixes https://github.com/tgstation/-tg-station/issues/14806
2016-01-23 18:17:01 +03:00
Bjorn Neergaard 7c7d35f204 Fix colon cancer 2016-01-22 20:18:01 -06:00
Bjorn Neergaard 1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Bjorn Neergaard b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard 87b0857b93 Refactor wire datums
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
2016-01-22 19:22:09 -06:00
Nerd Lord b92c159dee Fixes supermatter explosion being capped 2016-01-22 20:06:12 -05:00
tkdrg 14f90d8f1e Merge pull request #14748 from xxalpha/airlocktiming
Changed APC wire pulsing and airlock autoclose() to use timers.
2016-01-22 21:36:56 -03:00
Razharas 4244d67b1c Makes SMES great again
Makes SMES great again
2016-01-21 00:31:04 +03:00
xxalpha de44d7ec43 Changed APC wire pulsing and airlock autoclose() to use timers.
a

round
2016-01-20 21:26:44 +00:00
Razharas 247505d448 Final solution to the Mean() question
Final solution to the Mean() question
2016-01-20 01:03:20 +03:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Bjorn Neergaard 41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard a1ff8e8783 Refactor tgui interactions
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
2016-01-18 14:27:56 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
Razharas afccde250c Further corrections to smeses
Further corrections to smeses
2016-01-18 17:10:35 +03:00
Razharas c71c01f4e9 Roundstart smes fix
Roundstart smes fix
2016-01-18 17:00:30 +03:00
tkdrg ace569e951 Merge pull request #14678 from Buggy123/patch-9
Fixes energy ball Destroy()
2016-01-17 22:05:03 -03:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
duncathan salt 24784b8283 Merge pull request #14666 from Razharas/SMESfix
Makes SMES drain cells on deconstruction
2016-01-17 10:07:16 -06:00
Buggy123 52879ba052 Fixes energy ball Destroy() 2016-01-16 19:00:39 -05:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Razharas 36f0daa071 Makes SMES drain cells on deconstruction
Makes SMES drain cells on deconstruction
Fixes https://github.com/tgstation/-tg-station/issues/6451
2016-01-16 19:38:35 +03:00
Nerd Lord 3f2bcdb25b Fixes an old as fuck bug where the malfhack var wasn't set on APCs hacked by malf AIs. 2016-01-15 23:55:51 -05:00