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

..

circuitboards

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

2015-11-02 09:25:04 +01:00

grenades

Security Gear II

2015-12-02 13:42:41 -05:00

implants

Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak

2015-12-02 09:56:07 +10:30

material

Added boot knives and putting a knife in your boot.

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

melee

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

storage

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

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

tanks

Oxygen tanks now have a visual indicator of their pressure on the item icon.

2015-11-20 19:36:33 +10:30

AI_modules.dm

…

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

Merge pull request #11563 from PsiOmegaDelta/151202-LessListingMoreObserving

2015-12-02 12:29:45 -05:00

cards_ids.dm

Fixes being unable to emag secure closets.

2015-12-02 08:30:47 +01:00

cigs_lighters.dm

…

clown_items.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

explosives.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

handcuffs.dm

Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly).

2015-12-01 02:04:10 +10:30

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

…

policetape.dm

Police tape rewrite

2015-10-22 14:31:04 +02:00

power_cells.dm

More merge conflict resolution.

2015-09-13 21:12:14 -05:00

RCD.dm

…

RSF.dm

…

scrolls.dm

…

shields.dm

Glowy items.

2015-09-20 18:18:19 +02:00

stunbaton.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

syndie.dm

…

tape.dm

You can now pull your punches when engaging in unarmed combat.

2015-12-01 02:04:39 +10:30

teleportation.dm

…

tools.dm

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

traps.dm

…

trays.dm

…

weaponry.dm

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

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

weldbackpack.dm

…

wires.dm

…