Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

circuitboards

Polaris sync

2017-12-21 04:01:07 -05:00

grenades

Works on New Blob

2017-11-29 22:35:01 -05:00

id cards

Polaris Sync

2017-11-04 13:37:13 -04:00

implants

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

material

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

melee

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

storage

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

tanks

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

AI_modules.dm

One Crew Member

2017-11-26 12:28:59 -05:00

autopsy.dm

…

candle.dm

…

cards_ids_vr.dm

…

cigs_lighters.dm

…

clown_items.dm

grammar never ends (#4421)

2017-12-08 15:30:34 -06:00

cosmetics.dm

…

dna_injector.dm

…

explosives.dm

…

extinguisher.dm

…

flamethrower.dm

…

game_kit.dm

…

gift_wrappaper.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

handcuffs.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

hydroponics.dm

…

improvised_components.dm

…

manuals_vr.dm

Revert "Ace didn't write this version"

2017-11-18 10:57:36 -05:00

manuals.dm

…

mop_deploy.dm

…

mop.dm

…

paint.dm

…

paiwire.dm

Polaris sync

2017-12-21 04:01:07 -05:00

policetape.dm

…

RCD.dm

Merge pull request #4118 from mistyLuminescence/cryostorage

2017-10-22 19:03:07 -05:00

RSF.dm

…

scrolls.dm

…

shields_vr.dm

…

shields.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

stunbaton.dm

Adds the Lost Drone

2017-09-22 01:17:53 -04:00

surgery_tools.dm

Adds the bone clamp, and some alien surgery tools

2017-09-22 20:45:00 -05:00

swords_axes_etc.dm

…

syndie.dm

…

tape.dm

…

teleportation.dm

Removes Hardcoded Z-check on Handteles

2018-01-01 06:41:17 -05:00

tools.dm

Fixes Exploit with Power Tools

2018-01-04 03:08:56 -05:00

towels.dm

…

traps.dm

The game actually clicks when it claims to. (#4403)

2017-12-07 18:18:01 -06:00

trays.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

weaponry.dm

Adds Variable Click Delay

2017-11-28 16:11:56 -05:00

weldbackpack.dm

Adds a mounted welder to the welderpacks in engineering.

2017-10-31 20:07:14 -07:00