Mike Long b12a9fb7fc Refactor & nerf infernal jaunt. ...

Infernal jaunt now has a warm up time for entering and exiting the jaunt.

Plus it looks nicer too.

2016-06-06 23:01:23 -04: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

Merge pull request #18197 from pudl/tank

2016-06-07 13:01:16 +12:00

chatter

…

client

Merge pull request #18264 from coiax/deathrattles

2016-06-07 13:08:52 +12:00

clothing

Merge pull request #18047 from kevinz000/embraceTheMemes

2016-06-07 13:03:08 +12:00

countdown

Push

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

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

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

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

2016-05-28 00:24:58 +01:00

holodeck

Adds two new holodeck levels

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

html_interface

…

hydroponics

makes plant analyzers fit in belts again (#18324)

2016-06-06 20:01:51 -05: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 #17934 from coiax/bluespace-shelter-templates

2016-06-07 13:43:59 +12:00

mob

Merge pull request #18218 from Xhuis/rich_bears

2016-06-07 14:02:53 +12: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

Conflicts II

2016-06-06 21:31:38 -04: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 pull request #18321 from Cruix/nukeops_war_fix

2016-06-07 13:32:49 +12:00

space_transition

…

spells

Refactor & nerf infernal jaunt.

2016-06-06 23:01:23 -04:00

stock_market

Addition Ratvar conversion effects and related changes

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

surgery

but with conflictless sprites

2016-06-06 19:59:37 -04:00

telesci

Removes spawn() from some things

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

tgui

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

2016-05-28 00:24:58 +01:00

tooltip

…

uplink

Fixes for Merge Tokens (#18168)

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

vehicles

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

zombie

Removes spawn() from some things

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