Mloc 503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm

2013-11-24 23:37:09 +00:00

..

crates_lockers

Conflict fix.

2013-10-21 04:37:28 +03:00

stool_bed_chair_nest

Fixes #3642

2013-11-24 09:22:50 +10:30

barsign.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

bedsheet_bin.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

coathanger.dm

Coat racks. Can hold either labcoat or detective coat.

2013-10-10 15:33:02 +04:00

displaycase.dm

…

door_assembly.dm

Quickfix for multitile doors.

2013-06-25 11:40:01 +03:00

electricchair.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

extinguisher.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

false_walls.dm

-Now instead of just giving an angry message, any living mob with a client and the nuke disk that hits a transition on Z1 on them will have their momentum reversed, effectively sending them back where they came from. (Dead and clientless mobs still have the disk deleted from them)

2013-01-10 19:07:02 +00:00

flora.dm

Same fix again.

2013-10-21 04:48:07 +03:00

girders.dm

Girder health/laserkill fix

2013-11-23 18:50:15 -05:00

grille.dm

Deconstruction fix.

2013-08-23 15:31:37 +03:00

janicart.dm

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

kitchen_spike.dm

Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.

2012-11-29 04:12:22 +00:00

ladders.dm

…

lamarr_cage.dm

Returned Lamarr.

2013-04-30 16:59:38 +04:00

lattice.dm

…

mineral_doors.dm

WIP ZAS rework.

2013-09-03 20:25:02 -07:00

mirror.dm

Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles.

2013-08-21 23:26:59 +01:00

mop_bucket.dm

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

morgue.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

musician.dm

The code compiles again but I make no promises about whether or not the piano works.

2012-12-30 17:51:49 +00:00

noticeboard.dm

…

safe.dm

…

signs.dm

Part 3: fixing shit

2013-07-06 02:53:06 +04:00

tables_racks.dm

Where can I get my idiot certificate.

2013-11-05 03:59:39 +04:00

tank_dispenser.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

target_stake.dm

…

transit_tubes.dm

fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected

2013-10-29 05:10:17 +10:00

watercloset.dm

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

windoor_assembly.dm

WIP ZAS rework.

2013-09-03 20:25:02 -07:00

window.dm

Startoad's plasma windows commit, I'm doing the github stuff for it.

2013-11-01 18:53:45 -07:00