Birdtalon d35155baec Merge branch 'master' into ERT-gun ...

# Conflicts:
#	code/modules/response_team/ert_outfits.dm

2018-09-22 14:04:35 +01:00

..

admin

Fixes special char being allowed in some name

2018-09-11 13:33:39 +08:00

alarm

…

antagonists

…

arcade

Fixes claw game

2018-09-06 14:43:43 +08:00

assembly

…

atmos_automation

…

awaymissions

Merge pull request #9443 from alex-gh/gateway_fix

2018-09-09 17:59:16 -04:00

busy_space

…

client

spacing

2018-08-28 16:05:39 -04:00

clothing

Merge branch 'master' into ERT-gun

2018-09-22 14:04:35 +01:00

countdown

…

crafting

…

customitems

Merge pull request #9484 from BottomQuarks/BottomQuark_Fluff_Item

2018-09-14 18:14:16 -07:00

detective_work

…

economy

Remove excessive var and add one missing return statement

2018-09-05 07:45:10 +08:00

error_handler

…

events

Merge pull request #9255 from variableundefined/EconomyRefactor

2018-09-04 17:14:25 -07:00

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

nightmare

2018-09-07 17:20:28 -04:00

food_and_drinks

secure stuff

2018-08-24 11:35:31 -04:00

games

…

holiday

…

hydroponics

failure messages, depot outgoing redspace portal

2018-08-16 00:57:59 -07:00

karma

…

library

…

lighting

…

logic

…

map_fluff

…

martial_arts

…

mining

failure messages, depot outgoing redspace portal

2018-08-16 00:57:59 -07:00

mob

lasertag ED-209 bots now get assigned correct names

2018-09-18 18:05:21 +01:00

modular_computers

Merge pull request #9255 from variableundefined/EconomyRefactor

2018-09-04 17:14:25 -07:00

nano

…

ninja

…

paperwork

Ghosts can no longer eject IDs from fax machines and ID computers.

2018-09-09 00:28:14 +02:00

pda

…

persistence

…

power

Fixes wire cutting runtime and other potential runtime.

2018-08-29 20:02:42 +08:00

procedural_mapping

…

projectiles

adds ERT sidearm "PDW-9"

2018-09-20 21:45:46 +01:00

reagents

Merge pull request #9259 from Kyep/make_meth_less_op

2018-09-04 09:46:55 -07:00

recycling

CrazyLemon RPD changes

2018-08-15 22:36:53 -07:00

research

Merge pull request #9369 from variableundefined/Analyzer

2018-09-04 09:04:14 -07:00

response_team

Merge branch 'master' into ERT-gun

2018-09-22 14:04:35 +01:00

ruins

…

scripting

Update Telecomms.dm

2018-09-08 21:27:32 +01:00

security_levels

…

shuttle

…

space_management

…

spacepods

…

station_goals

…

store

…

surgery

Merge branch 'master' into ERT-gun

2018-09-22 14:04:35 +01:00

telesci

failure messages, depot outgoing redspace portal

2018-08-16 00:57:59 -07:00

tooltip

…

tram

…

vehicle

…

vr

…