RKF45
5083e1cd47
Requested adjustments
2014-01-13 22:54:47 +01:00
RKF45
0a4a7c7c08
Merge remote-tracking branch 'upstream/dev' into paintmixing
2014-01-13 22:15:33 +01:00
Mloc
57a83eae70
Fix for #4194
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-13 14:27:44 +00:00
Mloc
75348f6dca
Fix for #4293
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-13 14:10:56 +00:00
Ccomp5950
d5bcef4f8a
Uplink fix item spawner fix.
...
Probably a merge conflict fix or something but some code got moved to an odd spot.
2014-01-12 22:37:00 -06:00
Chinsky
214e713960
Merge pull request #4284 from Mloc/bs12-cryosleep
...
Fix for assistants being unspawnable after one enters a cryopod.
2014-01-12 16:34:41 -08:00
Chinsky
cb72e02f23
Merge pull request #4285 from Faerdan/dev
...
NanoUI assets are now sent to the client automatically.
2014-01-12 16:34:10 -08:00
Mloc
e25c60f930
Fix for #4289
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-12 23:23:04 +00:00
Mark Aherne (Faerdan)
87c246ff06
APC NanoUI
...
* Created new APC UI
* Tweaked Chem Master UI width.
2014-01-12 23:11:49 +00:00
Mloc
e826458900
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-01-12 21:55:11 +00:00
Igor Golubkov
a0b909926b
Fix for broken on spawn chem_dispenser
...
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.
Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org >
2014-01-13 00:25:45 +04:00
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
Mloc-Argent
0215410e02
Fix for assistants being unspawnable after one enters a cryopod.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-12 13:54:32 +00:00
RKF45
b9c747aeaf
Makes mixing paints actually make sense
2014-01-12 12:04:18 +01: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
Chinsky
1d6c645bc9
Merge pull request #4279 from Ccomp5950/pda_optimizations
...
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
2014-01-11 18:48:55 -08:00
Ccomp5950
83ef93c41c
Merge pull request #4270 from Baystation12/master
...
Merge master into Dev
2014-01-11 18:18:03 -08:00
Rob Nelson
56e4b11ec5
Dynamic loading of posters
...
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00
Ccomp5950
167671d583
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
...
Should be noticably better on large population servers.
2014-01-11 20:09:11 -06:00
Rob Nelson
2e903710b0
Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint
2014-01-11 17:58:28 -08:00
Mark Aherne (Faerdan)
1f50cae6c2
SMES NanoUI
...
* Converted SMES to NanoUI.
2014-01-12 01:28:03 +00:00
RKF45
9e0391af04
Adds Baystation 12-specific posters
2014-01-12 01:42:41 +01:00
RKF45
fabfceaa5a
Fixed forever!
2014-01-11 22:50:22 +01:00
RKF45
8758ece582
Alright already.
2014-01-11 22:42:42 +01:00
RKF45
140fb27889
Fixes
2014-01-11 22:36:35 +01: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
Mloc
df970c5d2d
Merge pull request #4274 from SkyMarshal/airfixes
...
Patches some logic holes in ZAS, specifically rebuilding and deletion.
2014-01-11 11:56:43 -08:00
SkyMarshal
350c1500cf
Patches some logic holes in ZAS, specifically rebuilding and deletion. Fixes #4273
2014-01-11 11:34:57 -07: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
LightningIron
b3bfc9684d
Made APC modules cost 50m/50g from autolathe, on par with other engineering modules.
2014-01-10 20:58:20 -06: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
SkyMarshal
ccaef844bf
Fixes derpiness with ZAS heat transfer.
2014-01-10 16:40:06 -07:00
SkyMarshal
890491da61
Fixes ZAS silliness with SoftDelete
2014-01-10 16:38:08 -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
