Anewbe c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute ...

# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

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

..

admin

Merge pull request #4367 from Neerti/11/28/2017_variable_click_delay

2017-11-29 12:53:15 -06:00

alarm

…

assembly

…

awaymissions

…

blob

Works on New Blob

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

blob2

Travis Appeasement

2017-11-29 23:33:25 -05:00

busy_space

ATC ships won't go to the current station

2017-10-31 22:59:34 -07:00

client

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

clothing

Merge pull request #4371 from Anewbe/phoron_contamination

2017-11-30 20:43:27 -05:00

customitems

…

detectivework

…

economy

gives vatties an econ modifier

2017-11-04 17:15:23 -07:00

error_handler

…

events

Works on New Blob

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

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

Adds Variable Click Delay

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

icon generation

…

integrated_electronics

Sanitizes Circuit Inputs

2017-11-17 18:38:48 -05:00

library

…

lighting

…

lore_codex

…

maps

Adds Submap (PoI) Seeding Procedure

2017-11-21 19:21:39 -05:00

materials

work

2017-11-26 12:08:05 -05:00

metric

…

mining

…

mob

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute

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

multiz

Adds parachutes

2017-12-01 18:37:30 -06:00

nano

…

organs

Adds Variable Click Delay

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

overmap

I before E (#4287)

2017-11-19 03:00:14 -06:00

paperwork

work

2017-11-26 12:08:05 -05:00

planet

Makes blizzards less cold

2017-11-26 16:34:28 -06:00

power

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

projectiles

Finishes UFO PoI

2017-11-26 15:10:25 -05:00

random_map

Removes Cracked Asteroids from Sif Mountains

2017-11-26 03:57:56 -05:00

reagents

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

recycling

…

research

Merge pull request #4357 from Cyantime/communicator

2017-11-27 20:19:59 -05:00

scripting

…

security levels

…

shieldgen

Adds Variable Click Delay

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

shuttles

I before E (#4287)

2017-11-19 03:00:14 -06:00

spells

…

surgery

Adds a cap to losebreath

2017-11-26 21:55:55 -06:00

tables

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

turbolift

…

vehicles

Adds Variable Click Delay

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

ventcrawl

…

virus2

…

xenoarcheaology

Adds Exploration Equipment

2017-11-24 07:22:35 -05:00

xenobio

Adds Variable Click Delay

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

xenobio2

…

xgm

…