caelaislinn b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>

2012-05-21 17:48:12 +10:00

..

alien

TG: Adds randomlly spawning rooms to the mining asteroid that contain various

2012-05-02 00:21:18 +01:00

closets

TG: - Wallets once again spawn in the satchels in the cabinets in the dorm.

2012-05-19 01:44:24 +01:00

devices

As many bugfixes as I could cram into here.

2012-05-20 14:23:10 -07:00

items

Fixes for forcing no hair/face hair. Shuffles checks around for Pick Up Verb.

2012-05-20 21:37:10 +01:00

radio

Fixes Tajaran Transformation. Few sanity checks and bugfixes added.

2012-05-20 12:32:00 -07:00

secstorage

TG: - Moved three (well two, one was doubled for some reason) screen/attackby()

2012-04-22 19:22:02 +01:00

stacks

TG: -r-table parts are now made by using four metal rods on regular table parts.

2012-05-15 01:02:01 +01:00

storage

lowered radsuits from 4 to 1 per crate

2012-05-20 22:26:01 +10:00

tanks

Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently.

2012-05-11 18:06:21 -07:00

biomass.dm

As many bugfixes as I could cram into here.

2012-05-20 14:23:10 -07:00

blood.dm

…

bodybag.dm

TG: •Softcaps, flippable

2012-04-10 00:17:14 +01:00

bombspawner.dm

…

cleaner.dm

…

closets.dm

TG: Fixed and further improved package wrapping. Added a sprite for wrapped closets.

2012-04-28 17:42:36 +01:00

contraband.dm

TG: Adding my stuff so I can work from my parents' computer

2012-05-01 23:48:09 +01:00

displaycase.dm

…

door_assembly.dm

Merge and compile fixes, changelog too.

2012-05-19 02:39:50 +01:00

effect_system.dm

Metal foam now blocks air.

2012-05-16 23:33:12 -07:00

electricchair.dm

Reverted electric chair changes.

2012-03-30 04:47:46 +01:00

empulse.dm

…

explosion.dm

…

gibs.dm

Merge branch 'DetectiveWork' of https://github.com/SkyMarshal/Baystation12 into SkyMarshal-DetectiveWork

2012-05-10 16:48:01 +01:00

glowshroom.dm

…

grille.dm

TG: - Moved three (well two, one was doubled for some reason) screen/attackby()

2012-04-22 19:22:02 +01:00

items.dm

More update_clothing() calls.

2012-05-20 00:02:23 +01:00

kitchen.dm

…

lamarr.dm

…

mineral_doors.dm

Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.

2012-05-11 18:02:30 -07:00

new_year.dm

…

noticeboard.dm

…

object_procs.dm

TG: AutoUpdateTK lags tremendously. TK functions as it used to before Doohl gave it

2012-05-13 00:42:09 +01:00

portals.dm

…

shooting_range.dm

TG: Modified TK to be more effective and polished. You can use the TK grab to

2012-04-25 22:22:05 +01:00

sign_decals.dm

Added another barsign wooo yayyyy wooooo

2012-04-17 17:46:01 +01:00

stool.dm

Fixes Track With Camera bug. Was probably my fault. Sorry!

2012-05-20 01:48:58 +01:00

structures.dm

TG: Added cult girders (sprites by Ausops).

2012-05-05 21:37:59 +01:00

tables_racks.dm

More update_clothing() calls.

2012-05-20 00:02:23 +01:00

tank.dm

Some more work on FEA, WIP FEA/ZAS work, does not effect the game currently.

2012-05-11 18:06:21 -07:00

toys.dm

Fixes crayons drawing without having a crayon.

2012-05-12 17:36:37 +01:00

transfer_valve.dm

TG: Adds a forum and wiki button to the game interface.

2012-05-06 01:22:29 +01:00

washing_machine.dm

…

watercloset.dm

TG: Moved sinks into watercloset.dm, removed sink.dm

2012-05-19 01:08:56 +01:00

weapons.dm

Improves how gas mixture datums are handled, reduces proc calls, commenting. Removed ghost-heating from cryo and "oxygen_agent_b" gas type.

2012-05-11 18:02:30 -07:00

window.dm

TG: - Ported over (Well basically completely recoded) the smooth window code from

2012-05-19 01:49:12 +01:00