Mark Aherne (Faerdan)
c9191faa14
NanoUI Caching and SMES tweaks
...
* Made NanoUI caching code neater, added check for directories (which are ignored).
* Moved SET to between MIN and MAX on SMES UI.
2014-01-12 20:07:48 +00:00
Mloc
c46d872e6c
Merge remote-tracking branch 'upstream/master' into dev
2014-01-12 19:46:31 +00:00
Mark Aherne (Faerdan)
214fbeee99
NanoUI assets are now sent to the client automatically.
...
* NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).
Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.
2014-01-12 15:30:25 +00:00
Ccomp5950
dc7e32a646
Merge pull request #4271 from Loganbacca/master
...
Plasma glass stacking fix
2014-01-11 19:39:22 -08:00
Ccomp5950
dfe96b3702
Merge pull request #4260 from Zuhayr/sandwiches
...
Sandwiches!
2014-01-11 19:15:56 -08:00
Chinsky
7a80f02670
Merge pull request #4278 from Faerdan/dev
...
SMES NanoUI
2014-01-11 19:04:18 -08:00
Ccomp5950
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
Mark Aherne (Faerdan)
1f50cae6c2
SMES NanoUI
...
* Converted SMES to NanoUI.
2014-01-12 01:28:03 +00:00
RKF45
8b384b0668
Various
2014-01-11 22:22:24 +01:00
RKF45
98834ea3cb
The costume crate has more than one suit
2014-01-11 22:20:50 +01:00
RKF45
ab8763378b
Paint mixing
2014-01-11 22:19:02 +01:00
Zuhayr
bd28c0c70b
Merge pull request #4263 from Furlucis/master
...
Talisman icon fix
2014-01-11 07:54:22 -08:00
Zuhayr
2dd2ce8ed1
Merge pull request #4262 from Ccomp5950/mouse_runtime
...
Runtime fix for people that jump back in their body before hitting respawn
2014-01-11 07:53:51 -08:00
Loganbacca
909928f3f9
Plasma glass stacking fix
2014-01-11 18:14:51 +13:00
Ccomp5950
3d34567d56
Merge pull request #4269 from LightningIron/master
...
Bugfixes
2014-01-10 19:28:23 -08:00
Ccomp5950
cbcd3d1468
Merge pull request #4265 from SkyMarshal/heatfix
...
Heatfix
2014-01-10 18:47:53 -08:00
LightningIron
cbd3f280af
Forgot to include the /spray/ part of the chemsprayer path.
2014-01-10 20:43:27 -06:00
LightningIron
5119882536
Fixes #4286 .
2014-01-10 20:36:20 -06:00
Zuhayr
adaccb3c3e
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-11 10:45:57 +10:30
SkyMarshal
9cae391e0e
Adds developer-level access to ZAS settings.
...
Fixes bug which would always let heat move through doors.
2014-01-10 16:48:16 -07:00
Furlucis
4340e4a6b5
Talisman icon fix
...
Makes talismans keep looking like talismans for more than a tick.
2014-01-10 17:09:01 -05:00
Ccomp5950
bc6561b9e4
Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes.
...
Who does that? People that cause runtimes, that's who!
(Jerks)
2014-01-10 15:59:40 -06:00
DJSnapshot
4219b597b6
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/customitems/item_defines.dm
2014-01-10 13:52:07 -08:00
Mloc
6f01e97161
Merge pull request #4248 from Zuhayr/dev
...
Dionaea changes (microwave recipe, holder procs) and resist verb.
2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3
Merge pull request #4252 from RKF45/ears
...
Tiny objects on ears
2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f
Merge pull request #4244 from LightningIron/master
...
Ninja bugfixes/minor code cleaning/energy cost changes
2014-01-10 13:42:42 -08:00
DJSnapshot
46c6145cf7
Made it so asay is not the same color as adminlogs.
2014-01-10 13:39:40 -08:00
DJSnapshot
f911f84bbd
Replaces modwho and adminwho with staffwho.
...
(Also, stealthfix.)
2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e
Merge remote-tracking branch 'upstream/master' into dev
2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
Zuhayr
5cddea72f0
Colour fix for bread slices.
2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c
Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food.
2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338
Added filling_color var to food items for use in sandwiches.
2014-01-11 02:35:10 +10:30
Zuhayr
38f47f5ae1
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-10 21:26:47 +10:30
DJSnapshot
1e4abf785e
Merge pull request #4237 from Mloc/bs12-tgstuff
...
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
Ccomp5950
2b57605738
Merge pull request #4253 from SkyMarshal/mining
...
Fix for mining.
2014-01-09 17:22:12 -08:00
SkyMarshal
8885ad630e
Fix for mining.
...
Fixes #4249
2014-01-09 17:26:13 -07:00
RKF45
16cc421e34
Tiny objects on ears
2014-01-09 23:45:08 +01:00
RKF45
c47be94b42
Removes braindeath as IC term
2014-01-09 21:49:21 +01:00
Zuhayr
906768070f
Resolved custom_items.dmi.
2014-01-10 04:15:21 +10:30
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
LightningIron
8c26c23157
Merge remote-tracking branch 'upstream/master'
2014-01-09 11:15:26 -06:00
Zuhayr
d3d6294ab0
Compile fix, ugh.
2014-01-10 03:07:17 +10:30
Zuhayr
331dd3e286
Added resist check for holder items. Also hopefully prevented dionaea icons from remaining on a human mob.
2014-01-10 01:58:22 +10:30
Zuhayr
f23bb5e1fd
Roasted diona, for ZomgPonies/Paradise.
2014-01-10 00:26:23 +10:30
Zuhayr
35d8219bb6
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
2014-01-09 23:57:20 +10:30
Zuhayr
f51c44cee9
Typo and compile fix.
2014-01-09 23:56:14 +10:30
Zuhayr
943554242a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-09 23:53:34 +10:30
Zuhayr
70fe0e02cd
Merge pull request #4245 from SkyMarshal/airfixes
...
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
