SinTwo a2b24d64b7 TG_Port_2 ...

Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm

2015-10-11 00:36:13 -04:00

..

circuitboards

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

2015-08-23 01:30:46 -04:00

grenades

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

implants

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

2015-09-08 08:22:37 +02:00

material

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

melee

Refactors duplicate parry code

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

storage

TG_Port_2

2015-10-11 00:36:13 -04:00

tanks

Updates blob

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

AI_modules.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

autopsy.dm

…

candle.dm

…

cards_ids_syndicate.dm

Adds Syndicate ID sprite

2015-09-20 21:11:49 +02:00

cards_ids.dm

Added the Resomi.

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

cigs_lighters.dm

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

2015-08-14 08:34:42 +02:00

clown_items.dm

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

2015-08-12 21:18:18 +02:00

cosmetics.dm

…

dice.dm

…

dna_injector.dm

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

explosives.dm

Destroy tweaks.

2015-09-25 10:44:23 +02:00

extinguisher.dm

Woodrat Work v8.1 "Glasslock Edition"

2015-08-20 16:55:56 -07:00

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Moved cap guns to proper guns.

2015-08-14 05:51:29 +03:00

handcuffs.dm

Added the Resomi.

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

hydroponics.dm

…

improvised_components.dm

…

kitchen.dm

…

manuals.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

mop_deploy.dm

…

mop.dm

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

2015-08-23 01:30:46 -04:00

paint.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

paiwire.dm

…

policetape.dm

…

power_cells.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-24 18:16:36 +03:00

RCD.dm

colony-1 could not be saved, unfortunately. RIP

2015-08-23 18:04:47 -04:00

RSF.dm

…

scrolls.dm

…

shields.dm

Glowy items.

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

stunbaton.dm

Active stunbatons now glow.

2015-09-19 21:12:19 +02:00

surgery_limbattachment.dm

…

surgery_tools.dm

…

swords_axes_etc.dm

Updates files as necessary to adhere to the new standard.

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

syndie.dm

…

tape.dm

…

teleportation.dm

…

tools.dm

Mech chargers are now a single machine

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

traps.dm

Removes bear traps from the custodial closet, adds autolathe recipe

2015-08-22 02:31:19 -04:00

trays.dm

Removes *COVERSEYES

2015-08-18 17:06:49 -04:00

weaponry.dm

Updates blob

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

weldbackpack.dm

…

wires.dm

…