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

# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme

2017-04-01 19:19:42 -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 polaris-sync

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

material

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

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

melee

Changes the way embedding works

2016-10-11 21:29:49 -05:00

storage

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

2017-04-01 19:19:42 -04: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

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05: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

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

cards_ids_syndicate.dm

…

cards_ids_vr.dm

…

cards_ids.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

cigs_lighters.dm

Fixes a thing

2017-03-28 20:17:35 -05:00

clown_items.dm

…

cosmetics.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

dice.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

dna_injector.dm

This should be the other way around

2017-02-06 16:21:06 -05:00

explosives.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

extinguisher.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

flamethrower.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

game_kit.dm

…

gift_wrappaper.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

handcuffs.dm

Kills telecuffs

2016-10-23 21:31:12 -05:00

hydroponics.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

improvised_components.dm

Wooden circlets can now be worn as hats

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

manuals.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

mop_deploy.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

mop.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

paint.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

paiwire.dm

…

policetape.dm

Merge pull request #2807 from MagmaRam/door_tape

2016-11-22 21:57:11 -06:00

power_cells.dm

Fixes device cells

2016-10-16 13:42:16 -05:00

RCD.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

RSF.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

scrolls.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

shields.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

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

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

syndie.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

tape.dm

Should fix the tape thing.

2016-10-17 16:52:20 -05:00

teleportation.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

tools.dm

Adds a bunch of things to cargo

2017-03-31 00:23:27 -05:00

towels.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

traps.dm

Sorta implements armor soak, very WIP

2017-03-10 20:26:37 -06:00

trays.dm

Fix two extra robust bugs

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

weaponry.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

weldbackpack.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00