Miauw 2a71a8ee12 Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi

2015-01-07 14:59:24 +01:00

..

crates_lockers

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

2015-01-07 14:59:24 +01:00

stool_bed_chair_nest

Merge pull request #6811 from paprka/spessbuckle

2015-01-06 04:38:48 -03:00

transit_tubes

SubSystem rewrite

2014-12-31 13:25:41 +00:00

bedsheet_bin.dm

…

displaycase.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

door_assembly.dm

Fixes being unable to build doors over firelocks, blast doors and shutters.

2014-12-31 20:47:17 -07:00

dresser.dm

Fixes some grammar for the dresser.

2014-12-22 20:00:31 -06:00

electricchair.dm

…

extinguisher.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

false_walls.dm

Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound.

2014-12-09 19:38:49 -08:00

flora.dm

Fixes ausbushes icon_state for the subclasses

2014-12-03 21:34:02 -03:00

girders.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

grille.dm

Merge pull request #6584 from phil235/HoloSwordFix

2015-01-01 16:39:16 -03:00

janicart.dm

Merge pull request #5427 from paprka/littlejanitorthings

2014-11-03 17:19:37 -08:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

lattice.dm

clicking on the lattice will now construct a catwalk as well

2014-12-29 05:24:48 -08:00

mineral_doors.dm

…

mirror.dm

Fixes being able to smash grille/newscaster/mirror/lights with holo esword.

2014-12-24 23:50:20 +01:00

mop_bucket.dm

…

morgue.dm

Can now click switch with any object

2014-12-14 12:22:15 +01:00

musician.dm

…

noticeboard.dm

…

OpTable.dm

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

safe.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

signs.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

spirit_board.dm

…

statues.dm

Final Statues

2015-01-01 01:43:28 +02:00

table_frames.dm

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

tables_racks.dm

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

2014-12-28 11:20:15 +03:00

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

Fixed being able to spam slam someone onto a toilet during a swirlie.

2014-12-24 17:10:27 +01:00

windoor_assembly.dm

Fix windoor construction exploit.

2014-11-24 13:12:00 +01:00

window.dm

Merge pull request #6651 from paprka/tablesandwindowsbaby

2015-01-03 00:22:29 +01:00