Commit Graph

2293 Commits

Author SHA1 Message Date
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
tkdrg
1c2727d765 Merge pull request #15133 from Firecage/Moremodulemoves
Moves some more files to the modules section.
2016-02-03 22:09:12 -03: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
xxalpha
2bd13e700a get_areas_in_range()
nospace

wormhole
2016-02-03 07:10:34 +00:00
Cheridan
c0211799d3 Merge pull request #15104 from bgobandit/blackslimefluff
Black slime fluff better accounts for lizards.
2016-02-01 15:17:57 -06:00
Firecage
dbc744d9ee Moves the code for spells to the Modules section. 2016-02-01 19:33:44 +02:00
duncathan salt
52e60d80c9 Merge pull request #15089 from Firecage/atmos2modules
Take two of grouping the atmos files in modules.
2016-01-31 17:47:47 -06:00
tkdrg
7891ac2805 Merge pull request #15034 from AnturK/shuttle_templates
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg
1158d540de Merge pull request #15058 from erwgd/BotanyToolsShakersForVendors
Added botany tools, salt and pepper shakers to vendors, changed how you get rice seeds
2016-01-31 13:23:21 -03:00
tkdrg
da056af83f Merge pull request #15018 from LanCartwright/fungaltbchange
removes fungal tb from traitor
2016-01-31 11:36:06 -03:00
bgobandit
81131e691f Black slime fluff better accounts for lizards. 2016-01-30 22:41:30 -05:00
phil235
743f28d348 Merge pull request #15038 from neersighted/newwizardmeta
End the new wizard meta
2016-01-31 02:17:45 +01:00
Akke
f0ef994da6 adds a nerf too
removes box
2016-01-30 19:42:13 +00:00
Firecage
6e27893e38 Take to of grouping the atmos files in modules. 2016-01-30 21:09:38 +02:00
AnturK
1cbb8137d9 Moves initialize from /atom/movable to /atom
Bit cleaner powernet/pipes initialization in templates
2016-01-30 14:34:34 +01:00
tkdrg
8c85f520bc Merge pull request #15019 from PKPenguin321/patch-11
fixes this easy as shit bug
2016-01-29 23:39:16 -03:00
erwgd
e0b9182f96 Adds rice seed to seeds supply crate 2016-01-30 02:10:30 +00:00
tkdrg
41fd32f91e Merge pull request #15003 from MrStonedOne/patch-140
[s]Fixes locate exploit in datum/topic_input
2016-01-29 19:36:37 -03:00
AnturK
8999db80b4 Fixes shuttles loading improperly in templates
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
Bjorn Neergaard
6fbee2bd03 End the new wizard meta
Prevent mindswap when suiciding

Fixes #14982
2016-01-29 09:32:59 -06:00
PKPenguin321
8e23924edc fixes this easy as shit bug
fuck git
2016-01-28 17:11:54 -08:00
Kyle Spier-Swenson
a664aab5e7 [s]Fixes locate exploit in datum/topic_input
Also holy fuck this datum is a thing.
2016-01-28 02:11:59 -08:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
5e2e295760 Fix wires swapping 2016-01-27 02:11:40 -06:00
Kyle Spier-Swenson
2db4f0f079 Update wires.dm 2016-01-26 18:48:10 -08:00
Razharas
e67012ef41 Merge pull request #14773 from ChangelingRain/punchy
Nerfs golem punch stun chances
2016-01-27 04:09:14 +03:00
Razharas
3325776591 Merge pull request #14902 from neersighted/fun_removal
Resolve wire issues and remove difficult colors
2016-01-27 04:02:52 +03:00
Bjorn Neergaard
d0f57701d9 Remove old define 2016-01-26 14:07:17 -06:00
duncathan salt
7c76c0ddbb Merge pull request #14887 from neersighted/Byond509
Byond509
2016-01-26 01:57:42 -06:00
Bjorn Neergaard
5e16230433 Fix a number of wire issues.
Fix wires being shuffled twice (they should only be randomized once). We
now shuffle and cache instead of shuffling the cache.

Fix syndicate bomb messages (bomb, not loc should show messages).

Explicitly copy lists when we create wires as to avoid any chance of
modifying the global color list. No bugs here but there is a posibility
if admins varedit wires.

Fix training bombs generating duplicate wires by adding a real
shuffle proc that clears the wire list first (Fixes #14915).
2016-01-25 21:30:30 -06:00
duncathan salt
c7e09e6040 Merge pull request #14871 from KorPhaeron/remove_grab4
Removes grab from Charge spell
2016-01-25 19:27:04 -06:00
Bjorn Neergaard
eab359ea18 Remove dark/british colors from wires
Fixes #14901
2016-01-25 17:23:51 -06:00
Bjorn Neergaard
961eeea661 Rewrite SSUs, tweak newly added UIs 2016-01-25 12:03:07 -06:00
Bjorn Neergaard
725e970cfd Fix air alarm panic siphon 2016-01-25 12:03:04 -06:00
Bjorn Neergaard
c78e1ec2ac Fix a lot of wire interactions 2016-01-25 12:03:03 -06:00
Bjorn Neergaard
014e83fec6 Fix tgui machine interactions status checks 2016-01-25 12:03:02 -06:00
Bjorn Neergaard
2f46b224ae Fix air alarm hacking, raise SStimer display 2016-01-25 12:03:00 -06:00
Bjorn Neergaard
f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
Remie Richards
94f1b51893 Renames appearance flag defines. 2016-01-24 23:26:14 -06:00
Remie Richards
f4bb5fcf0e Min compiler version is now 509, Weapon hit indicators and Progress bars no longer colour/rotate/match the alpha of the atoms they are attached to. 2016-01-24 23:22:12 -06:00
Cheridan
b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys
Fixes some awful defines to not be hacks
2016-01-24 21:15:14 -06:00
KorPhaeron
6dc40d2c17 Removes grab from Charge spell 2016-01-24 19:19:35 -06:00
duncathan salt
10788ec515 Merge pull request #14785 from AnturK/aicardgui
Adds AI card tgui
2016-01-24 10:53:34 -06:00
tkdrg
b8ecaa07ea Merge pull request #14791 from AnturK/mindswapfixes
Mindswap fixes
2016-01-24 13:31:51 -03:00
AnturK
9e8eca56a7 Adds AI card tgui
Removes the multiple AI's on one card semi feature.
2016-01-24 12:52:31 +01:00
Bjorn Neergaard
f0f5187f5c Fix autolathe hacking 2016-01-23 18:56:38 -06:00
Bjorn Neergaard
e3b073a54a Fix autolathe/airlock lights and remove spawn() 2016-01-23 18:56:36 -06:00
Bjorn Neergaard
2998624bc3 Fix tanks not showing they are connected to a mask
Fix wire pulse sound
2016-01-23 18:56:34 -06:00
Bjorn Neergaard
ca24badfb6 Fix wire feedback sound
Apparently wires used to play a default windows chime when cut, adding audible feedback
It was the windows 'bong' sound, and I'd rather not try to replicate it, so instead
we play the wirecutter sound very softly
2016-01-23 18:56:33 -06:00
Bjorn Neergaard
d712615db8 Fix tgui showing NaN, fix vending machines having no wires 2016-01-22 21:42:35 -06:00