Commit Graph

14295 Commits

Author SHA1 Message Date
Bjorn Neergaard bb10a81310 Optimize more listmos procs, rename a few vars 2016-02-05 18:56:41 -06:00
Bjorn Neergaard 7822b1ee75 Lismos speed improvements 2016-02-05 18:55:39 -06: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 14ee8eec08 Fix tank UI for ghosts
istype is needed
2016-02-05 17:06:08 -06:00
Bjorn Neergaard 46fe1f82a5 Factor out filter to be more generic 2016-02-05 17:06:07 -06:00
Bjorn Neergaard 9386602acf tgui cargo console
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06: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
Bjorn Neergaard 9783f47514 Centralize shuttle computers 2016-02-05 17:06:04 -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
Bjorn Neergaard 796cca2753 tgui scrubbers
removes area atmos computer
2016-02-05 17:06:02 -06:00
Bjorn Neergaard c9f61fd7da Rework portable atmos; tgui portable pump 2016-02-05 17:06:00 -06:00
Bjorn Neergaard af19bff008 tgui sleepers and uplink search
Fix some state logic
Fix SVGs
display: based filtering
input component

Update syndicate colors

@ChangelingRain
2016-02-05 17:05:59 -06:00
Bjorn Neergaard 302a02aa88 istypeless meme
@RemieRichards
2016-02-05 14:29:53 -06:00
Bjorn Neergaard 1e8ca7193c Speed reagent reaction code 2016-02-05 12:36:35 -06:00
KorPhaeron 2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
Bjorn Neergaard 289f0c19e1 Fix flashlights flashing 2016-02-05 12:06:44 -06:00
tkdrg 6154334fbc Merge pull request #15201 from KorPhaeron/turret_fixes
Fixes AI core turrets shooting at pingsky
2016-02-05 14:58:38 -03:00
tkdrg 01b1ed7cc0 Merge pull request #15193 from xxalpha/putin
Fixes var edited SMES starting with no charge.
2016-02-05 14:56:53 -03:00
tkdrg 0f38d829b5 Merge pull request #15191 from KorPhaeron/chaplain
Theatre Access for Chaplain
2016-02-05 14:54:15 -03:00
tkdrg d188447041 Merge pull request #15121 from neersighted/hotkeys
Add hotkey preferences
2016-02-05 14:52:34 -03:00
Remie Richards 10f725d216 Merge pull request #15119 from lordpidey/pipe_suicide
Added a new suicide act for pipe valves.
2016-02-05 15:53:24 +00:00
xxalpha acddd54b36 Kinetic accelerators automatically reload. 2016-02-05 08:02:59 +00: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
tkdrg 70a69ae1e7 Merge pull request #15141 from KorPhaeron/practice
Makes practice lasers scarier
2016-02-05 00:58:16 -03:00
tkdrg b3daf4be22 Merge pull request #14981 from neersighted/510
BYOND 510
2016-02-05 00:04:59 -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
KorPhaeron 7ed46468f5 preserves name 2016-02-04 19:41:12 -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
tkdrg 058f93a052 Merge pull request #14911 from MMMiracles/L6butbetter
local man rebalances bulldog and SAW, ruins everything
2016-02-04 21:59:28 -03:00
phil235 5728358b6b Some errors and merge conflicts fixing mistakes. 2016-02-05 01:12:39 +01:00
duncathan salt d9672fa638 Merge pull request #15176 from ChangelingRain/fixedblobchemicals
Blob tweaks and a new blob chemical
2016-02-04 18:02:45 -06:00
Nerd Lord f96290ff81 weakens death EMP 2016-02-04 18:54:01 -05:00
Bjorn Neergaard 5fc59f53a1 Fix lizard hissing 2016-02-04 17:19:47 -06:00
Bjorn Neergaard a5f09e103e Remove eroneous code; click catcher define; bygex path fix 2016-02-04 17:19:47 -06:00
Bjorn Neergaard ef19e7904f Support Regex in replaceall, re-implement lizard hiss limits 2016-02-04 17:19:46 -06:00
Bjorn Neergaard e3bd22b481 Stub regex.Replace, re-implement SQL note conversion 2016-02-04 17:19:46 -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 2500e241ca Re-implement lizard hissing
Note that this reverts #13656, due to this bug (http://www.byond.com/forum/?post=2027070)
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
tkdrg ba699024ab Merge pull request #15204 from neersighted/hrefs
[s]Fix bad checks in holodeck
2016-02-04 20:03:30 -03:00
Bjorn Neergaard ccc229a157 Fix bad checks in holodeck 2016-02-04 16:29:23 -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
KorPhaeron 744b0946a2 Bot turret fix 2016-02-04 12:06:49 -06:00
phil235 16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +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
xxalpha cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00