PsiOmegaDelta b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev. ...

Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml

2015-12-06 11:48:20 +01:00

..

alien

Merge remote-tracking branch 'upstream/dev' into xenomorphs

2015-10-10 12:05:36 +02:00

crates_lockers

Merge remote-tracking branch 'upstream/dev-freeze' into dev.

2015-12-06 11:48:20 +01:00

stool_bed_chair_nest

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2

2015-10-15 07:08:16 -04:00

barsign.dm

Barsigns now rotate correctly with client.dir, improved the code a bit

2015-08-18 07:18:13 +01:00

bedsheet_bin.dm

Allows bedsheets to be cut up into rags

2015-08-13 18:37:18 -04:00

coathanger.dm

Resprites, renames, and repaths the detective uniforms.

2015-08-22 19:43:28 -05:00

curtains.dm

Fewer decal icon states, shower curtains.

2015-08-16 06:09:16 -07:00

displaycase.dm

Updates blob

2015-10-05 18:10:16 +03:00

door_assembly.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

electricchair.dm

…

extinguisher.dm

…

fireaxe_cabinet.dm

Total rewrite of awful fireaxe cabinets.

2015-12-02 22:49:47 +10:30

flora.dm

…

girders.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

grille.dm

Updates blob

2015-10-05 18:10:16 +03:00

inflatable.dm

Merge pull request #11195 from Hubblenaut/dev

2015-11-02 00:11:14 +03:00

janicart.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-24 10:53:57 +02:00

kitchen_spike.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

lattice.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

mirror.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

mop_bucket.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

morgue.dm

Wireless button updates

2015-11-22 22:32:52 +13:00

musician.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

noticeboard.dm

…

safe.dm

Updates blob

2015-10-05 18:10:16 +03:00

signs.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

simple_doors.dm

Adds common proc to obtain the material of an object

2015-08-01 23:03:21 -04:00

tank_dispenser.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

target_stake.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

transit_tubes.dm

…

under_wardrobe.dm

Splits species flags

2015-08-18 17:02:44 -04:00

watercloset.dm

Mops can now be wet in buckets or sinks.

2015-12-01 02:05:27 +10:30

windoor_assembly.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

window_spawner.dm

Crescent windows are now indestructible.

2015-10-28 09:25:12 +01:00

window.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30