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

..

crates_lockers

Personnelly, I feel this pull request was successfull.

2014-01-08 19:26:10 +00: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

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00:00

door_assembly.dm

code/game/object/items/weapons/* lowercase pass

2014-01-08 19:56:00 +00: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

Fixes #4040

2013-12-18 11:10:00 +10:30

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

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

lamarr_cage.dm

Returned Lamarr.

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

lattice.dm

File restructuring!

2012-08-29 18:00:30 +00:00

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

Fixes morgue trays used by ghosts and what not

2014-01-08 19:39:20 +00: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

-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.

2012-10-25 19:15:51 +00:00

safe.dm

Fixes issue 1040. Ability to give mechs all access and remove DNA locks from mechs and more.

2012-10-27 14:51:30 +00:00

signs.dm

Adds signs pointing where department is.

2013-12-18 12:34:53 +04:00

tables_racks.dm

Fixes #4034

2013-12-18 11:17:17 +10:30

tank_dispenser.dm

Massive click code rework by SuperSayu, ported from TG.

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

target_stake.dm

Another small chunk of reorganizing objects.

2012-08-22 21:55:46 +00:00

transit_tubes.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

watercloset.dm

More typo fixes

2014-01-15 20:03:12 +13:00

windoor_assembly.dm

WIP ZAS rework.

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

window.dm

Fixes #4040

2013-12-18 11:10:00 +10:30