GunHog bfd644231f Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay ...

# Conflicts:
#	code/modules/mob/living/living_defines.dm
#	icons/mob/actions.dmi

2016-06-06 20:05:23 -05:00

..

admin

Adds mass zombie cure, for the boring people

2016-06-05 13:05:21 +01:00

assembly

…

atmospherics

Hopefully fixes conflicts.

2016-06-02 22:37:18 -03:00

awaymissions

Allows mob spawners to have stuff in their hands

2016-06-02 22:01:08 -05:00

cargo

Adjusts RCD family export prices to be realistic (#18186)

2016-06-03 14:45:04 -05:00

chatter

…

client

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

clothing

Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor

2016-06-04 17:41:43 +02:00

countdown

Push

2016-06-02 18:28:46 +01:00

crafting

…

detectivework

Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor

2016-06-04 17:41:43 +02:00

emoji

…

events

Refactors the Prison Break event into the Grey Tide event

2016-06-04 15:35:55 -07:00

flufftext

…

food_and_drinks

Merge pull request #18150 from PKPenguin321/salty

2016-06-06 01:18:23 +12:00

games

…

holiday

…

holodeck

Adds two new holodeck levels

2016-06-02 16:34:41 +01:00

html_interface

…

hydroponics

Merge pull request #18154 from PKPenguin321/plant-analyzer-repath

2016-06-03 16:41:02 +10:00

jobs

repaths plant analyzers

2016-06-01 22:44:03 -07:00

library

Addition Ratvar conversion effects and related changes

2016-06-03 23:19:13 -04:00

lighting

…

mining

Merge pull request #18257 from KorPhaeron/snow

2016-06-06 00:40:40 -05:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay

2016-06-06 20:05:23 -05:00

ninja

…

paperwork

Merge branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor

2016-06-04 17:41:43 +02:00

power

is this a turf

2016-06-04 21:56:10 -04:00

procedural_mapping

…

projectiles

Merge pull request #18237 from coiax/fix-18236

2016-06-07 10:26:05 +12:00

reagents

Merge pull request #18282 from coiax/removing-spawn

2016-06-07 10:21:54 +12:00

recycling

…

research

why

2016-06-04 02:39:38 -07:00

ruins

Merge pull request #18226 from MMMiracles/evenMORERUINS

2016-06-06 01:24:43 +12:00

security_levels

…

shuttle

Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR

2016-06-05 09:03:22 -04:00

space_transition

…

spells

Merge remote-tracking branch 'remotes/upstream/master' into Aimed_Spit_For_Mista_Jay

2016-06-06 20:05:23 -05:00

stock_market

Addition Ratvar conversion effects and related changes

2016-06-03 23:19:13 -04:00

surgery

Merge pull request #18282 from coiax/removing-spawn

2016-06-07 10:21:54 +12:00

telesci

Removes spawn() from some things

2016-06-05 20:08:36 +01:00

tgui

…

tooltip

…

uplink

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

vehicles

…

zombie

Removes spawn() from some things

2016-06-05 20:08:36 +01:00