4DPlanner c7d8e5b5f7 Merge remote-tracking branch 'upstream/master' into datum - I genuinely ...

have no idea how this was a merge conflict and also fixes paren

2017-06-06 02:49:04 +01:00

..

admin

Merge remote-tracking branch 'upstream/master' into datum - I genuinely

2017-06-06 02:49:04 +01:00

assembly

Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual (#27344)

2017-05-17 22:54:54 -05:00

atmospherics

Fixes Grid Check Event creating challenging engine issue (#27920)

2017-06-01 20:51:11 -03:00

awaymissions

Merge pull request #28045 from WJohn/fixes_suit_store

2017-06-04 21:23:51 -03:00

cargo

Adds The NT-75 Electromagnetic Power Inducer (#27653)

2017-05-31 14:59:13 -03:00

chatter

…

client

adds coalesce to world.internet_address

2017-05-28 15:46:35 +10:00

clothing

Adds some more syndicate equipment. (#28046)

2017-06-05 15:50:11 -03:00

crafting

The Crafting Menu now has subcategories! (#27863)

2017-06-03 19:28:14 +02:00

detectivework

…

emoji

…

error_handler

…

events

Refactors the latejoin list (#26647)

2017-06-04 17:07:46 -03:00

fields

Fixes @kevinz000's shitcode

2017-05-22 10:42:24 -04:00

flufftext

Fixes bsa not showing up (#28032)

2017-06-04 09:42:50 -03:00

food_and_drinks

The Crafting Menu now has subcategories! (#27863)

2017-06-03 19:28:14 +02:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Removes the shadowshroom admin message

2017-05-24 09:47:41 -04:00

jobs

Proposal: typed map variables

2017-06-02 21:14:17 +01:00

language

Merge pull request #27676 from KorPhaeron/shade

2017-05-26 20:03:47 -03:00

library

Update lib_machines.dm (#27566)

2017-05-24 10:46:45 +02:00

lighting

Fixes nested lights not working properly

2017-05-08 14:16:46 -07:00

mapping

Fixes sortedAreas use.

2017-06-02 22:15:41 +02:00

mining

Adds another unique KA mod to necropolis chests (#27982)

2017-06-05 14:52:03 -03:00

mob

Merge pull request #28064 from ChangelingRain/hierophanttweak

2017-06-05 15:26:07 -03:00

modular_computers

Fixes roundstart ntnet runtime

2017-06-02 09:49:02 -04:00

ninja

Adds The NT-75 Electromagnetic Power Inducer (#27653)

2017-05-31 14:59:13 -03:00

orbit

…

paperwork

Merge pull request #27805 from AnturK/useless

2017-05-29 16:59:55 -03:00

power

Makes cable small again

2017-06-04 17:58:25 -04:00

procedural_mapping

Update repair.dm

2017-06-03 14:43:52 -07:00

projectiles

Adds consciousness checks to beam rifles (#28079)

2017-06-05 22:37:54 -03:00

reagents

Merge pull request #27935 from Expletive/botanicaldispenser

2017-06-03 04:30:39 -03:00

recycling

Update conveyor2.dm

2017-05-21 13:09:52 -07:00

research

Add text fields, rglass smelting, style changes, sheet insertion.

2017-06-05 04:37:47 -07:00

ruins

Adds some more syndicate equipment. (#28046)

2017-06-05 15:50:11 -03:00

security_levels

…

server_tools

Add status string for server tools

2017-06-04 16:15:10 -04:00

shuttle

Refactors the latejoin list (#26647)

2017-06-04 17:07:46 -03:00

space_transition

…

spells

Removes ragin mages (#27872)

2017-06-04 21:30:59 +02:00

station_goals

Fixes bsa not showing up (#28032)

2017-06-04 09:42:50 -03:00

stock_market

…

surgery

Fixes bsa not showing up (#28032)

2017-06-04 09:42:50 -03:00

tgui

…

tooltip

…

uplink

Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#28035)

2017-06-03 14:34:01 +01:00

vehicles

refactors how vehicles use offsets + multiseat (#27265)

2017-05-23 00:48:45 -03:00

VR

…

zombie

Brains extracted from infectious zombies keep their old species

2017-05-23 15:34:26 -04:00