Commit Graph

11794 Commits

Author SHA1 Message Date
Chinsky 8430e0a720 Merge pull request #4319 from RKF45/colour
Realistic colour mixing
2014-01-19 21:23:45 -08:00
Chinsky 5a8eb3c455 Merge pull request #4318 from Loganbacca/engineroom
Engine Room Redesign
2014-01-19 21:22:45 -08:00
Zuhayr 0ad12c7e72 Merge pull request #4313 from RKF45/small
Small
2014-01-19 18:58:33 -08:00
RKF45 d35c9954b6 Rework of colour mixing 2014-01-19 21:47:42 +01:00
Loganbacca 24c6063a07 Updated Supermatter user manual sprite 2014-01-20 01:57:58 +13:00
Loganbacca 0f4068724b Pod door tweaks
- Added directional pod door sprites
- Made pod doors change draw layer when they open and close
   - Pod doors draw behind the glass layer when open
   - Pod doors draw in front of the glass layer when closed
2014-01-20 01:57:57 +13:00
Loganbacca 0ede7ed9cb Engineering area tweaks
- Added a few Engineering areas, and moved one from the Rust files
- Made the "Engineering Storage" area overlay sprite transparent
2014-01-20 01:57:57 +13:00
RKF45 ca4bb831d4 Debug 2014-01-19 12:03:32 +01:00
RKF45 9511ad9c1b Silicate needs to be tested first 2014-01-18 22:18:24 +01:00
RKF45 5649bb7fe2 Various tiny improvements 2014-01-18 22:15:46 +01:00
RKF45 75e66d546a Rework of colour mixing 2014-01-18 21:09:02 +01:00
Furlucis 7dd5968f76 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-17 03:05:04 -05:00
Furlucis 88181a8057 Tweaks homunculi
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
2014-01-17 03:00:32 -05:00
Furlucis 5268e4f299 Removes the second holywater
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.
2014-01-17 02:57:47 -05:00
Ccomp5950 1f7cbfbff4 Supermatter update.
Now gives an instability% warning in it's messages.

Limited the "If they can see it and aren't wearing mesons, have some hallucinations" range to a max of 7

Can't be pelted with lasers while out in space allowing for unlimited power only to drag it back on a turf and instantly explode.

Removed extra if(!removed) check, we already checked for that above.

Moved the oxygen ratio variable "oxygen" to be declared under the object instead of it's process proc for easier debugging.

Changed the alert interval.

Add luminosity value so the big glowing shard of supermatter actually generates light.
2014-01-15 20:22:50 -06:00
Ccomp5950 171e63a66f Moved Supermatter.dm out of the WorkInProgress directory. 2014-01-15 17:33:13 -06:00
Ccomp5950 8a179a8ff1 Merge pull request #4299 from Faerdan/dev
Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 15:21:47 -08:00
Ccomp5950 dd7fef9dc2 Merge pull request #4277 from RKF45/paint
BS12 posters
2014-01-15 14:02:47 -08:00
RKF45 30f2d49f01 Quotes inside strings confuse and scare me. 2014-01-15 22:45:10 +01:00
Mark Aherne (Faerdan) 024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs.
* Added Canister, Tank & Tank Transfer Value NanoUIs.
2014-01-15 01:08:45 +00:00
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
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
Mark Aherne (Faerdan) 87c246ff06 APC NanoUI
* Created new APC UI
* Tweaked Chem Master UI width.
2014-01-12 23:11:49 +00: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
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