Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

circuitboards

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2017-04-01 19:19:42 -04:00

grenades

Added vore capabilies to the new simple_animal system.

2017-03-22 19:32:19 -04:00

implants

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

material

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

melee

…

storage

Merge remote-tracking branch 'polaris/master' into polaris-sync

2017-04-15 23:14:32 -05:00

tanks

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-03-21 11:22:29 -04:00

AI_modules.dm

Fixed various hand sprite issues.

2017-04-04 08:29:53 +01:00

autopsy.dm

Added in-hand sprites to most item lacking them from the Medical department.

2017-03-26 07:04:01 +01:00

candle.dm

…

cards_ids_syndicate.dm

…

cards_ids_vr.dm

…

cards_ids.dm

…

cigs_lighters.dm

Fixes the smoking pipe sprites

2017-04-14 20:28:50 -05:00

clown_items.dm

…

cosmetics.dm

…

dice.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

…

handcuffs.dm

Should fix borg handcuffs

2017-04-11 13:12:17 -05:00

hydroponics.dm

…

improvised_components.dm

Wooden circlets can now be worn as hats

2017-04-01 15:31:06 -05:00

manuals.dm

Updates in-game EVA manual

2017-04-17 11:19:39 -05:00

mop_deploy.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

Sleevecards!

2017-04-06 17:59:58 -04:00

permits.dm

Adds Drone Identification Cards

2017-04-23 16:30:32 -04:00

policetape.dm

Changes tape coloring + slight rework

2017-04-19 19:37:56 +01:00

power_cells.dm

…

RCD.dm

…

RSF.dm

Makes the Rapid Service Fabricator use an actual glass, not the parent.

2017-04-22 17:51:21 -07:00

scrolls.dm

…

shields.dm

…

stunbaton.dm

Device Cell QOL

2017-03-29 13:58:35 -05:00

surgery_tools.dm

Fixes descriptions on 3 surgical tools

2017-03-02 14:08:13 -05:00

swords_axes_etc.dm

…

syndie.dm

Missed a test var

2017-04-04 22:38:07 -05:00

tape.dm

Addresses @MagmaRam's concerns.

2017-04-19 18:37:21 -07:00

teleportation.dm

…

tools.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

towels.dm

Towels dry

2017-04-02 17:34:52 -05:00

traps.dm

Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife.

2017-04-17 19:31:01 +01:00

trays.dm

Fix two extra robust bugs

2017-03-03 16:25:53 -05:00

weaponry.dm

Another e-net tweak

2017-04-11 21:03:09 -04:00

weldbackpack.dm

…