Commit Graph

24890 Commits

Author SHA1 Message Date
duncathan salt 1493db977e Compile fix part 3 2016-01-20 09:17:18 -06:00
duncathan salt aef02401f8 Compile fix part 2 2016-01-20 09:09:06 -06:00
duncathan salt 7cdf700fb8 Compile fix part 1 2016-01-20 08:58:51 -06:00
Firecage d2bd6871d5 Merge Conflict Fix 2016-01-20 14:07:14 +02:00
Jordie 02a6c6cdef Merge pull request #14744 from tgstation/piperuntimes
Resolves atmos runtimes
2016-01-20 16:46:55 +11:00
duncathan salt 7ea17e7925 Merge pull request #14743 from neersighted/mo_tguis
tgui: fix-22
2016-01-19 23:40:04 -06:00
Bjorn Neergaard 6ac9997edc Remove atmos radio delay; fix setting external pressure; fix phantom atmos machines
Fixes #11953
2016-01-19 23:29:54 -06:00
duncathan b45b9ef363 pipes don't transport air across time and space 2016-01-19 23:14:15 -06:00
xxalpha 329444f0ea small icon smoothing optimization 2016-01-20 01:49:06 +00:00
xxalpha 638a47d4ac Merge remote-tracking branch 'upstream/master' into smoothballs 2016-01-20 01:31:05 +00:00
duncathan 5413fa9288 better idea 2016-01-19 18:12:00 -06:00
xxalpha 346c698162 conflict fix
FORWARD SLASH
2016-01-19 23:06:23 +00:00
Bjorn Neergaard 3ae2397d9f Fix interacting with intercoms as AI 2016-01-19 17:02:59 -06:00
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Razharas 247505d448 Final solution to the Mean() question
Final solution to the Mean() question
2016-01-20 01:03:20 +03:00
Bjorn Neergaard ce36ee73e9 Fix uplink size 2016-01-19 08:41:51 -06:00
Bjorn Neergaard d87ddf0790 Add parent call, fixing uplink runtime 2016-01-19 08:41:51 -06:00
Bjorn Neergaard e54ea7e451 Tweak a few UIs; try to fix canister relabel 2016-01-19 08:41:50 -06:00
xxalpha aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
duncathan salt ae2b35124e Merge pull request #14711 from Shadowlight213/Playerooccolorfix
Fixes the Reset player OOC color verb not working
2016-01-19 07:29:23 -06:00
duncathan salt 1b2ec539af Merge pull request #14708 from xxalpha/aimoduleinstall
Installing laws to an empty AI core will now use install() instead of snowflake.
2016-01-19 07:28:25 -06:00
duncathan salt 75755a12b8 Merge pull request #14710 from KorPhaeron/AI_fix
Fixes AI not recieving malf powers and cyborgs not recieving 0 law
2016-01-19 07:27:16 -06:00
duncathan salt 410885e609 Merge pull request #14709 from xxalpha/thiswasalreadyfixed
jump to area uses safepick
2016-01-19 07:26:33 -06:00
duncathan salt f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
Razharas 34d4f155d1 Fixes sleep clicking
Fixes sleep clicking
Fixes https://github.com/tgstation/-tg-station/issues/14456
2016-01-19 15:10:23 +03:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
duncathan 4e61b999fa resolves atmos runtimes 2016-01-19 00:52:06 -06:00
duncathan salt 536beac2f9 Merge pull request #14732 from tgstation/atmosfixes
Atmos fixes
2016-01-18 22:13:37 -06:00
KorPhaeron 52ea5c5c63 Ranged Guardian 2016-01-18 22:09:00 -06:00
Shadowlight213 92103ac3f4 Defines 2016-01-18 20:08:27 -08:00
duncathan 5fc694911f fixes toxins 2016-01-18 22:01:15 -06:00
duncathan 60d85e8c6d >tfw your high priority bug has a one character fix 2016-01-18 21:38:19 -06:00
duncathan ed974ff559 atmos fixes 2016-01-18 21:24:26 -06:00
Razharas ac75a418a1 Merge pull request #14658 from nullstation/bug_14599
Call check_shields when attacked by an abductor baton.
2016-01-19 03:49:42 +03:00
Razharas 6143894aae Merge pull request #14704 from AnturK/jetpacksareforlosers
Fixes simple syndicates space move
2016-01-19 03:48:31 +03:00
Razharas 9e1923cc52 Merge pull request #14694 from xxalpha/zhe
Fixes covering clothing not hiding gender on examine()
2016-01-19 03:46:35 +03:00
Razharas 8a5edaa06e Merge pull request #14693 from xxalpha/airlockpower
Fixed airlock lights turning on when airlock is unpowered.
2016-01-19 03:46:12 +03:00
Razharas 3020846f97 Merge pull request #14692 from AnturK/rollforfixes
Random Fixes
2016-01-19 03:45:43 +03:00
duncathan salt 118af31dc3 Merge pull request #14699 from Razharas/GibFix
Fixes ling armour being ungibbable
2016-01-18 18:31:14 -06:00
tkdrg 0a6c050862 Merge pull request #14726 from neersighted/mo_tguis
Hotfix for MULEs; half of the UIs
2016-01-18 20:11:14 -03:00
Bjorn Neergaard 41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard 09aff20b6f Hotfix for MULEs 2016-01-18 16:26:18 -06:00
duncathan salt ee1067cb5c Merge pull request #14686 from neersighted/mo_tguis
Mo' tgui mo' commits
2016-01-18 14:54:12 -06:00
Bjorn Neergaard aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard 5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -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 e2c0ea9cca tgui atmos and station alert consoles 2016-01-18 14:27:55 -06:00
Bjorn Neergaard b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard 718639a1c3 Add new syndicate logo
Thanks to @YotaXP
2016-01-18 14:26:28 -06:00
Bjorn Neergaard 4a617062d8 Refactor uplinks; fix up tooltips and make uplink more interactive 2016-01-18 14:25:52 -06:00