Commit Graph

11844 Commits

Author SHA1 Message Date
Zuhayr
d38c190a57 Merged multiz icons into structures.dmi. 2014-01-25 03:13:56 +10:30
Zuhayr
3093a00707 Renamed controler.dm. 2014-01-25 03:13:06 +10:30
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
SkyMarshal
8badd4de18 Fixes an error with the explosions-deleting-zone-air detection. 2014-01-22 22:49:37 -07:00
Zuhayr
dba1ad0819 Merge pull request #4316 from RKF45/robots
Fixes for emagging robots
2014-01-22 01:09:51 -08:00
DJSnapshot
e76838bd6e fix for muting deadme as well. 2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9 Admin requested addition of a global dsay toggle. 2014-01-20 18:27:12 -08:00
Furlucis
005d72feb4 Typo fix
Fixes a reagent recipe.
2014-01-20 03:20:35 -05:00
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
Ccomp5950
0870844898 SMES fix, AI's can now use them.
Thinking this was a typo, though quite honestly I'm not sure why this test
is even here as distance checks are built into nanoUI but since feradan put it in
I'm kinda not wanting to remove it.
2014-01-19 21:26:15 -06:00
Loganbacca
7f89f602b2 Fixed rad collector toxin drain bug
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
2014-01-20 16:16:02 +13: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
5a9e8e0f30 Fixes for emagging robots 2014-01-19 12:16:10 +01: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
Kani0824
7a7fc7e1ea Removed book that causes braindeadness
Choosing a certain religion name and/or deity causes player to start out with 100 brain loss.  Removed that.
2014-01-17 18:06:30 -05: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
DJSnapshot
04b47fa6a0 Merge pull request #4302 from Ccomp5950/mouse_antagHUD
AntagHUD restrictions, disallow players becoming mice.
2014-01-15 22:23:38 -08:00
Ccomp5950
039d2d75bf Merge pull request #4288 from BcTpe4HbIu/master
Fix for broken on spawn chem_dispenser
2014-01-15 20:44:57 -08: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