Commit Graph

11813 Commits

Author SHA1 Message Date
Chinsky
3b26dab954 Merge pull request #4309 from LBraindead/dev
AMEN
2014-01-19 21:25:19 -08:00
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
LordBraindead
d5eb58d8d6 generalized the z-level atmospipes 2014-01-19 12:00:22 +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
LBraindead
1f9716d1f2 Update disposal.dm 2014-01-18 01:10:18 +01:00
LBraindead
ac1f334919 Update Turfs.dm
open space
2014-01-18 00:37:52 +01:00
LBraindead
6cef89777d Update Structures.dm
stairs and ladders
2014-01-18 00:37:22 +01:00
LBraindead
e9838702ff Update Pipes.dm
add up and down pipe
2014-01-18 00:36:46 +01:00
LBraindead
b7c502152c Update Movement.dm
jetpack movement
2014-01-18 00:36:14 +01:00
LBraindead
d106e70b02 Create controler.dm
z-level controler
2014-01-18 00:35:36 +01:00
LBraindead
bbe01a80e6 Update explosion.dm
transfer explosions accross z-levels
2014-01-18 00:33:41 +01:00
LBraindead
3879477151 Update disposal-construction.dm
new pipe construction
2014-01-18 00:32:06 +01:00
LBraindead
f3240073dc Update disposal.dm
new disposal pipes
2014-01-18 00:31:27 +01:00
LBraindead
8592fdb953 Update pipe_dispenser.dm
dispensing new pipes
2014-01-18 00:30:06 +01:00
LBraindead
f653216cde Update construction.dm
dispensing new pipes
2014-01-18 00:29:18 +01:00
LBraindead
ca2de46bc8 Update turf.dm
preventing space being made and immediately changed to open space
2014-01-18 00:28:20 +01:00
LBraindead
4bccee98ba Update power.dm
powernet connection for z-levels
2014-01-18 00:20:22 +01:00
LBraindead
cfcb3e65cd Update cable.dm
cable construction
2014-01-18 00:19:08 +01:00
LBraindead
9d618b2a11 Update lattice.dm
allow lattices to exist on open space
2014-01-18 00:16:14 +01:00
LBraindead
f58487a0e9 Update ZAS_Zones.dm
ZAS adjustments
2014-01-18 00:14:01 +01:00
LBraindead
d1874bec2e Update Functions.dm
ZAS adjustments
2014-01-18 00:10:39 +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