3cb348c477
Merge pull request #14761 from neersighted/tgui
...
tgui wires; refactor wire datums; more to come
2016-01-23 02:24:34 +00:00
7c7d35f204
Fix colon cancer
2016-01-22 20:18:01 -06: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
655bec0590
Merge pull request #14775 from octareenroon91/patch-34
...
Enforce Consistency in Chem Machinery
2016-01-22 22:23:17 -03:00
09571bd45f
Allow custom pizzas in pizza boxes
...
Also fix boxes icons being wrong after surviving an explosion
2016-01-22 19:22:12 -06:00
92f0df219b
Don't send duplicate JSON down the wire
2016-01-22 19:22:11 -06:00
99e5764719
Refactor pizza_bomb, tweak pizza_bomb sprites
...
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites
Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -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
cda2f26d56
tgui wires initial
2016-01-22 19:13:23 -06:00
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
c26a9488d4
Merge pull request #14762 from AnturK/botradiofix
...
Fixes Pingsky Radio
2016-01-22 21:34:17 -03:00
b8e967dad4
Merge pull request #14769 from MMMiracles/mapeditsgalore
...
Map Fixes
2016-01-22 21:28:44 -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
0148fd5c39
Merge pull request #14725 from PKPenguin321/patch-9
...
Fixes armcannon messages displaying to everybody
2016-01-23 00:12:38 +00:00
8643aee84f
adds a safety check to prevent runtimes
...
if the dummy parent item somehow gets spawned and an idiot player tries to use it, this stops them from runtiming/crashing the server. written in my free time so i may have done the "holder == null" part wrong, if it breaks ill fix it in a bit.
2016-01-22 10:33:52 -08:00
1eee6d0230
make the copypaste work.
2016-01-21 18:54:17 -06:00
97b781c1e7
Enforce Consistency in Chem Machinery
...
Chem dispensers, heaters, masters/condimasters, the grinder, and the pandemic will now accept any reagent_container with OPENCONTAINER. This generalizes the code.
2016-01-21 17:23:08 -06:00
b030a68814
Merge pull request #14751 from Razharas/MeanFix
...
Final solution to the Mean() question
2016-01-21 18:02:34 -03:00
8b06aa2bda
Merge pull request #14760 from Menshin/newplayer_login_lag_fix
...
Fixes lag on new player login
2016-01-21 23:41:39 +03:00
8b13e0cfdd
i love map conflicts
2016-01-21 01:20:25 -05:00
af5f726089
lodesmapedits
2016-01-21 01:07:06 -05:00
dd38db21b5
Merge pull request #14756 from duncathan/fuckshuttles
...
Pipes don't transport air across time and space
2016-01-21 15:13:39 +11:00
717ebcf6bb
Merge pull request #14707 from xxalpha/beachicons
...
Divide beach coast icon into two.
2016-01-20 20:34:41 -03:00
4244d67b1c
Makes SMES great again
...
Makes SMES great again
2016-01-21 00:31:04 +03:00
de44d7ec43
Changed APC wire pulsing and airlock autoclose() to use timers.
...
a
round
2016-01-20 21:26:44 +00: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
7cdf700fb8
Compile fix part 1
2016-01-20 08:58:51 -06:00
7ea17e7925
Merge pull request #14743 from neersighted/mo_tguis
...
tgui: fix-22
2016-01-19 23:40:04 -06:00
6ac9997edc
Remove atmos radio delay; fix setting external pressure; fix phantom atmos machines
...
Fixes #11953
2016-01-19 23:29:54 -06:00
b45b9ef363
pipes don't transport air across time and space
2016-01-19 23:14:15 -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
247505d448
Final solution to the Mean() question
...
Final solution to the Mean() question
2016-01-20 01:03:20 +03: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
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
0a6c050862
Merge pull request #14726 from neersighted/mo_tguis
...
Hotfix for MULEs; half of the UIs
2016-01-18 20:11:14 -03:00
41caa93330
Hotfix for display issues and UIs droping ui_act calls
2016-01-18 17:00:15 -06:00
09aff20b6f
Hotfix for MULEs
2016-01-18 16:26:18 -06:00
ee1067cb5c
Merge pull request #14686 from neersighted/mo_tguis
...
Mo' tgui mo' commits
2016-01-18 14:54:12 -06:00
aa8b6bfac2
Factor out radio helpers
2016-01-18 14:30:27 -06:00
Remie Richards
Bjorn Neergaard
tkdrg
AnturK
PKPenguin321
octareenroon91
Aranclanos
Razharas
MMMiracles
Jordie
Razharas
xxalpha
Nerd Lord
Menshin
duncathan salt