paprka 2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns ...

Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi

2014-10-19 17:30:47 -07:00

..

crates_lockers

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

2014-10-19 17:30:47 -07:00

stool_bed_chair_nest

Merge pull request #5263 from Aranclanos/electropackrevamp

2014-10-16 08:08:57 -05:00

transit_tubes

Changed breakout times to use the new constants

2014-10-15 11:40:25 -03:00

bedsheet_bin.dm

…

displaycase.dm

Merge pull request #4576 from Firecage/SPANCLASSES

2014-08-26 15:05:12 -05:00

door_assembly.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

dresser.dm

general code optimizations

2014-10-08 10:10:03 -07:00

electricchair.dm

Removed on variable and toggle verb

2014-09-16 12:11:42 +02:00

extinguisher.dm

…

false_walls.dm

Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades.

2014-09-12 06:44:25 -03:00

flora.dm

Small grammar fix.

2014-10-11 17:44:54 +02:00

girders.dm

Prevent displaced girders from being secured or build on if on a forbidden turf (space, shuttle, ...)

2014-09-16 23:47:26 +02:00

grille.dm

hitsound uses burn else instead of checking brute

2014-09-18 20:05:46 +10:00

janicart.dm

Disregard that I suck cocks

2014-08-21 07:35:51 -07:00

kitchen_spike.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

ladders.dm

…

lamarr_cage.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

lattice.dm

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

mineral_doors.dm

more icons for stuff, nightvision for aliens with hud icon button and toggle verb

2014-08-27 15:16:28 -07:00

mirror.dm

…

mop_bucket.dm

…

morgue.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

musician.dm

Replacing some hearers(...) with get_hearers_in_view(...).

2014-09-25 18:22:27 +02:00

noticeboard.dm

…

OpTable.dm

…

safe.dm

…

signs.dm

…

spirit_board.dm

Adds logging, fixes typo

2014-09-04 00:42:06 -05:00

statues.dm

Phase Honk

2014-09-15 12:44:52 +02:00

tables_racks.dm

big commit, handcuff overhaul

2014-10-08 13:19:54 -07:00

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

Showers wet the floor.

2014-09-07 00:11:04 +03:00

windoor_assembly.dm

Correcting a naming problem.

2014-10-03 17:35:21 +02:00

window.dm

Added unique sound for knocking on glass

2014-10-10 09:07:23 -07:00