Cheridan 6731fe8b83 Merge branch 'master' of https://github.com/tgstation/-tg-station ...

Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2013-04-16 23:07:35 -05:00

..

crates_lockers

Merge branch 'master' of https://github.com/tgstation/-tg-station

2013-04-16 23:07:35 -05:00

stool_bed_chair_nest

Slimes can no longer be buckled to things, they're too squishy (people were abusing the fact that slime AI can't unbuckle)

2013-01-17 00:59:18 +00:00

bedsheet_bin.dm

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

displaycase.dm

File restructuring!

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

door_assembly.dm

Fixes a runtime regarding the construction of standard airlocks. Changed two if checks [if (var == "")] for [if(!var)]

2013-03-20 08:20:39 -03:00

dresser.dm

Refactored underwear to use datum/sprite_accessory/underwear similar to hair and facial_hair.

2013-03-28 11:11:40 +00:00

electricchair.dm

Removed the stun of the electric chair. It was a 10 minute stun. It's open for discussion.

2013-03-20 10:25:38 -03:00

extinguisher.dm

Fixed airless misc research.

2013-01-08 20:10:07 +00:00

false_walls.dm

- Cleaned up false walls a bit and fixed some issues with using a welding tool with it. Fixes Issue 1288.

2013-02-28 23:22:37 +00:00

flora.dm

fixing typo with path.

2012-12-12 16:24:18 +00:00

girders.dm

- Fixes the ugly runtimes caused in r5087 about dismantling walls.

2012-11-17 03:50:45 +00:00

grille.dm

Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.

2013-01-20 10:45:20 +00:00

janicart.dm

Updating to fit with Cheri's sprite pull.

2013-03-30 17:50:25 +00: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

…

lattice.dm

File restructuring!

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

mineral_doors.dm

Added 3 more slime types so the evolution tree would be symmetrical again.

2013-02-01 10:16:54 +00:00

mirror.dm

This should fix the following runtimes:

2013-02-22 02:06:02 +00:00

mop_bucket.dm

Updates the mop and mop bucket code. Should work exactly the same.

2013-03-30 04:17:55 +00:00

morgue.dm

File restructuring!

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

musician.dm

Cleaned up redundant piano/violin sound files and made playnote() code not be a giant unmanageable switch

2013-04-04 06:55:38 -04: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

OpTable.dm

Overhauled grabs. They should pretty much do the same thing as before, although they should be a fair bit more effective.

2013-03-07 01:30:29 +00:00

safe.dm

Fix for the safe being very occasionally uncrackable (thanks, Sabbat).

2013-02-26 01:14:26 +00:00

signs.dm

Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.

2013-01-21 00:11:48 +00:00

tables_racks.dm

Overhauled grabs. They should pretty much do the same thing as before, although they should be a fair bit more effective.

2013-03-07 01:30:29 +00:00

tank_dispenser.dm

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

target_stake.dm

Another small chunk of reorganizing objects.

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

transit_tubes.dm

Quick cleanup/fix

2013-03-17 21:13:19 -04:00

watercloset.dm

MAKESHIFT WEAPONS UPDATE

2013-04-16 22:59:01 -05:00

windoor_assembly.dm

Fixed windoors becoming a fountain of infinite airlock electronics, added a check to see if it had electronics in it. Fixes issue 1273.

2013-02-17 00:09:11 +00:00

window.dm

Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.

2013-01-20 10:45:20 +00:00