a189de0703
Merge branch 'master' of https://github.com/tgstation/-tg-station into MechPilots
...
Conflicts:
code/game/mecha/mecha.dm
2016-01-24 21:11:11 +00:00
10a924fc64
Adds Mecha Pilots! Syndicate soldiers who can pilot Mecha and use that Mecha's abilities and equipment.
2016-01-24 21:04:18 +00:00
748d991d93
nerfs golem and millsynth stun chances from about 60% and 100% to about 40% and 50%, respectively
2016-01-24 15:44:29 -05:00
3981022c2b
Fixes two issues(KOOOOOOOOR)
2016-01-24 15:35:47 -05:00
0d5885a1f0
Merge pull request #14819 from KorPhaeron/polymorph
...
Polymorph Fixes
2016-01-24 13:08:11 -06:00
5e8f4a7679
Merge pull request #14734 from KorPhaeron/night_vision
...
Fixes ranged guardian light
2016-01-24 13:06:10 -06:00
10788ec515
Merge pull request #14785 from AnturK/aicardgui
...
Adds AI card tgui
2016-01-24 10:53:34 -06:00
0f6bb2d0dc
Merge pull request #14723 from AnturK/notsorandomfixes
...
Fixes
2016-01-24 13:46:42 -03:00
b8ecaa07ea
Merge pull request #14791 from AnturK/mindswapfixes
...
Mindswap fixes
2016-01-24 13:31:51 -03:00
d2be78ab6c
Refactors renaming a bit
2016-01-24 12:56:50 +01:00
330684df11
Fixes constructed AI's not getting their preferred name
2016-01-24 12:56:03 +01:00
9e8eca56a7
Adds AI card tgui
...
Removes the multiple AI's on one card semi feature.
2016-01-24 12:52:31 +01:00
42cb52d9e2
Merge pull request #14793 from xxalpha/foamistransparent
...
Make foam transparent and cover everything including mobs.
2016-01-24 07:26:11 +03:00
43fd76b7d4
Forgot to update the check
2016-01-23 13:43:52 -06:00
19084954ab
Proper night vision toggle
2016-01-23 13:13:29 -06:00
45e541146b
Drone fix
2016-01-23 13:07:52 -06:00
89f9556b26
Fix
2016-01-24 00:39:13 +09:00
6972a21830
Fix for #14804
...
Thanks to phil235
2016-01-24 00:22:57 +09:00
2bf128232d
Gives Poly a rudimentary savefile (not committed, will be generated at data/npc_saves/Poly.sav) that allows him to retain his learned phrases between rounds.
...
Poly can keep up to 20 unique phrases (plus his defaults) at a time. If poly learns a 21st phrase (and eventually this would be any learned phrase) it will randomly remove one of the other 20. The default phrases can't be unlearned this way.
Poly unloads his memories when killed or as the game ends.
This mechanic is unique to Poly, normal parrots won't share his phrase list. He's also been made a little chattier than other parrots to flaunt this ability
2016-01-23 01:06:42 -05:00
e1b3815539
Fixes some awful defines to not be hacks
2016-01-22 19:07:37 -08:00
1599742f7e
Re-structure tgui's ui_act
2016-01-22 19:25:36 -06:00
4224c800f0
Rewrite cryo
...
Similar balance but now healing is all in the reagent; and code is much simplified
Remove cryo leaking air, it just consumes O2 now. Gasses with a higher
specific_heat can be used to improve efficiency.
Greatly buffs cryo upgrades, in return for slight decrease in un-upgraded
performance due to atmos simulation.
Fix canister relabeling icons (Fixes #14742 )
Add wrench sound to portable_atmospherics (consistency with ATMOSPHERICS/components)
Fix blood directly setting oxyloss (now uses adjustOxyLoss, balanced to be ~same as before)
2016-01-22 19:25:34 -06:00
b2629a56e2
Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes
2016-01-22 19:25:33 -06:00
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
c26a9488d4
Merge pull request #14762 from AnturK/botradiofix
...
Fixes Pingsky Radio
2016-01-22 21:34:17 -03:00
6df21ac81f
Merge pull request #14764 from ChangelingRain/slimeconsume
...
Slimes can no longer feed on simple animals that are immune to clone and toxin damage
2016-01-23 00:28:29 +00:00
32947c4cec
Changed it so bots are all on the mob layer.
2016-01-23 00:15:13 +00:00
12b9993b0a
Fixes mindswapping into AI
2016-01-22 23:41:47 +01:00
f8e429e80a
Changes punch damage from hardcoded values plus a species modifier to species vars.
...
Changes punch stun threshold from a hardcoded value to a species var.
2016-01-21 16:47:13 -05:00
dc6ecbe8f3
missed one
2016-01-20 15:51:33 -05:00
cd249d41f3
Slimes can no longer feed on simple animals that are immune to clone and toxin damage
...
Simple animal damage procs return the damage done(as one would expect)
2016-01-20 15:38:58 -05:00
f5b619147a
Fixes lag on new player login.
2016-01-20 19:50:46 +01:00
b879d40f04
Fixes Pingsky Radio
2016-01-20 16:39:57 +01:00
d2bd6871d5
Merge Conflict Fix
2016-01-20 14:07:14 +02:00
7ea17e7925
Merge pull request #14743 from neersighted/mo_tguis
...
tgui: fix-22
2016-01-19 23:40:04 -06:00
346c698162
conflict fix
...
FORWARD SLASH
2016-01-19 23:06:23 +00:00
1c34479376
Fix uplink code once and for all
...
Fixes #14733
2016-01-19 16:42:57 -06:00
aff9db930d
Merge remote-tracking branch 'upstream/master' into emaggedbots
2016-01-19 14:38:26 +00:00
410885e609
Merge pull request #14709 from xxalpha/thiswasalreadyfixed
...
jump to area uses safepick
2016-01-19 07:26:33 -06:00
f9e35f1695
Merge pull request #14706 from xxalpha/straightouttajacket
...
Fixes the straightjacket
2016-01-19 07:24:51 -06:00
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
52ea5c5c63
Ranged Guardian
2016-01-18 22:09:00 -06:00
6143894aae
Merge pull request #14704 from AnturK/jetpacksareforlosers
...
Fixes simple syndicates space move
2016-01-19 03:48:31 +03:00
9e1923cc52
Merge pull request #14694 from xxalpha/zhe
...
Fixes covering clothing not hiding gender on examine()
2016-01-19 03:46:35 +03:00
3020846f97
Merge pull request #14692 from AnturK/rollforfixes
...
Random Fixes
2016-01-19 03:45:43 +03:00
118af31dc3
Merge pull request #14699 from Razharas/GibFix
...
Fixes ling armour being ungibbable
2016-01-18 18:31:14 -06:00
09aff20b6f
Hotfix for MULEs
2016-01-18 16:26:18 -06:00
1c64360882
tgui atmos control computers
2016-01-18 14:21:57 -06:00
0a7236d955
Allow relabeling any canister; port MULEbot to tgui
2016-01-18 14:21:56 -06:00
9a9aaabb8d
Removed bot/Emag() proc. Silicons can't interface with human emagged bots.
2016-01-18 19:12:19 +00:00
Remie Richards
Nerd Lord
duncathan salt
tkdrg
AnturK
Razharas
KorPhaeron
KorPhaeron
Carl Ivanov
Incoming
MrPerson
Bjorn Neergaard
xxalpha
Menshin
Firecage