shizcalev e1086bb616 merge conflict fix

2017-06-25 12:35:36 -04:00

..

admin

Merge pull request #28697 from Jordie0608/whyarethepolltypesdefinesthatseemskindasilly

2017-06-23 16:50:29 -04:00

assembly

Stun is now a status effect (#28654)

2017-06-22 10:50:46 +10:00

atmospherics

merge conflict fix

2017-06-25 12:35:36 -04:00

awaymissions

…

cargo

Centcom starts importing cat ears/tails (#28732)

2017-06-24 18:47:44 -04:00

chatter

…

client

Makes oldchat show while goonchat loads, sends preload messages there.

2017-06-21 00:51:28 -07:00

clothing

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

crafting

Adds the skull codpiece, an accessory that can be worn above or below an exosuit. (#28479)

2017-06-23 14:33:17 -04:00

detectivework

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

emoji

…

error_handler

…

events

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

fields

…

flufftext

Unconscious and Knockdown are now status effects (#28696)

2017-06-23 12:00:49 -04:00

food_and_drinks

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

games

…

goonchat

Merge pull request #28670 from MrStonedOne/fixcidrandomizer

2017-06-22 21:49:41 -03:00

holiday

[READY] New holidays including Thanksgiving and Ramadan (#28054)

2017-06-23 16:24:28 -04:00

holodeck

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

html_interface

…

hydroponics

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

jobs

Station Engineers Spawn With Industrial Welder (#28740)

2017-06-25 10:17:14 -04:00

language

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

library

Grammar and message tweaks (#28642)

2017-06-21 15:14:27 -03:00

lighting

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

mapping

…

mining

Merge pull request #28716 from lzimann/offhand

2017-06-23 15:07:37 -04:00

mob

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

modular_computers

Adds custom lighting support to modular computers, and a flashlight to tablets (#28645)

2017-06-21 16:42:48 -04:00

ninja

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

orbit

…

paperwork

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

power

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

procedural_mapping

…

projectiles

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

reagents

Ancient Space Station [Space Spawn Ruin] (#28584)

2017-06-25 12:02:31 -04:00

recycling

Replaces "istype"s with is_helpers macros (#28676)

2017-06-22 15:03:19 -03:00

research

Intercoms are now constructable (#28659)

2017-06-23 14:39:43 -04:00

ruins

…

security_levels

Bluespace Artillery now requires keycard authentication to unlock controls (#28592)

2017-06-20 09:55:23 -04:00

server_tools

…

shuttle

Fixes whiteship escape (#28734)

2017-06-24 13:48:39 -03:00

space_transition

…

spells

Unconscious and Knockdown are now status effects (#28696)

2017-06-23 12:00:49 -04:00

station_goals

Bluespace Artillery now requires keycard authentication to unlock controls (#28592)

2017-06-20 09:55:23 -04:00

stock_market

…

surgery

Unconscious and Knockdown are now status effects (#28696)

2017-06-23 12:00:49 -04:00

tgui

…

tooltip

…

uplink

…

vehicles

…

VR

…

zombie

…