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

Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi

2015-06-01 09:07:03 +02:00

..

crates_lockers

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

2015-05-26 08:35:32 +02:00

stool_bed_chair_nest

Added MATERIAL_PADDING flag.

2015-05-31 17:19:32 +09:30

barsign.dm

Adds 9 new bar signs.

2015-04-24 17:35:07 +03:00

bedsheet_bin.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

coathanger.dm

Debugging!

2015-05-12 21:30:06 +09:30

curtains.dm

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

2015-05-11 09:28:59 +02:00

displaycase.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

door_assembly.dm

Fixes #9551

2015-05-31 03:36:07 +09:30

electricchair.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

extinguisher.dm

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

2015-03-31 02:13:22 -04:00

flora.dm

…

girders.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

grille.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

inflatable.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

janicart.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

kitchen_spike.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

ladders.dm

…

lamarr_cage.dm

Renamed shards, katanas, claymores.

2015-05-16 20:36:33 +09:30

lattice.dm

Adds two missing pooling instances and corrects broken grilles health status.

2015-05-02 21:46:30 +02:00

mirror.dm

Adds attack animation calls for attack_generic()

2015-05-20 00:19:39 -04:00

mop_bucket.dm

Chemistry commit

2015-03-25 19:09:10 +03:00

morgue.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

musician.dm

…

noticeboard.dm

Fixes #9076

2015-05-30 05:24:44 +09:30

safe.dm

…

signs.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

simple_doors.dm

Fixes #9581

2015-05-31 03:34:29 +09:30

tank_dispenser.dm

…

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

watercloset.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

windoor_assembly.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

window.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00