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

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

backpack.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

bags.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

belt.dm

Added the Resomi.

2015-09-04 08:57:03 +09:30

bible.dm

Makes beer and ale bottles into actual bottles, adjusts bottle smashing

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

boxes.dm

Completes the feature where mercenaries can setup fake crew announcements and records.

2015-08-14 13:42:11 +02:00

briefcase.dm

Entirely removes briefcase instastun and pointless New() definition

2015-06-05 09:00:19 +01:00

fancy.dm

qdel(reagent) adjustments.

2015-08-13 10:26:31 +02:00

firstaid.dm

First pass on custom item cleanup/refactor.

2015-05-12 10:53:16 +09:30

internal.dm

…

lockbox.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

misc.dm

Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir

2015-08-18 13:43:11 +01:00

secure.dm

Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon

2015-09-09 19:49:46 -04:00

storage.dm

Id card handling changes.

2015-08-21 14:04:06 +02:00

toolbox.dm

…

uplink_kits.dm

Update uplink_kits.dm

2015-06-21 16:21:51 -05:00

wallets.dm

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00