variableundefined 5c72537d8c Fixes merge conflicts

2018-11-14 09:21:21 +08:00

..

admin

Merge remote-tracking branch 'upstream/master' into updateicons

2018-11-08 20:24:48 -08:00

alarm

…

antagonists

…

arcade

Merge pull request #10076 from variableundefined/Addcards

2018-11-07 22:53:29 -08:00

assembly

…

atmos_automation

…

awaymissions

itsa me, the space-a bar

2018-11-03 20:57:09 -08:00

buildmode

…

busy_space

…

client

Remove catgirls

2018-11-08 20:58:04 -08:00

clothing

Fixes merge conflicts

2018-11-14 09:21:21 +08:00

countdown

…

crafting

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill

2018-11-08 01:58:53 -08:00

customitems

Fixes merge conflicts

2018-11-14 09:21:21 +08:00

detective_work

Forgot ERT, moved the boxes to boxes.dm

2018-11-10 12:08:06 +01:00

economy

…

error_handler

…

events

…

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

…

food_and_drinks

Port over fermentation barrel, minor refactor of reagent container, add in wine power etc.

2018-11-01 11:01:45 +08:00

games

Card Deck Fix

2018-11-12 23:24:52 -05:00

holiday

…

hydroponics

Requested changes

2018-11-10 12:17:27 +02:00

karma

…

library

Adds a lot of other machines

2018-11-10 19:22:23 +00:00

lighting

SSoverlays for human icons, mostly works

2018-11-08 20:24:22 -08:00

logic

Update code/modules/logic/dual_input.dm

2018-11-07 19:24:28 +01:00

map_fluff

…

martial_arts

…

mining

Merge pull request #10198 from farie82/apply-repair-logic

2018-11-12 18:13:46 +08:00

mob

Fixes merge conflicts

2018-11-14 09:21:21 +08:00

modular_computers

…

nano

…

ninja

…

paperwork

Merge pull request #10062 from Dave-TH/paper_fix

2018-10-30 10:53:58 +08:00

pda

Added mulebot control to captain's pda again

2018-11-07 13:14:58 +01:00

persistence

…

power

Merge pull request #10095 from AffectedArc07/crisp-screen-mmmmmm

2018-11-04 12:30:34 +08:00

procedural_mapping

…

projectiles

Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500,

2018-11-09 23:18:54 +00:00

reagents

Merge pull request #10194 from CornMyCob/pda-painter-wrench

2018-11-12 08:44:05 +08:00

recycling

Fixes merge conflicts

2018-11-14 09:21:21 +08:00

research

Lowers min metal return from autolathe to 500, reverts cost of foam darts to 500,

2018-11-09 23:18:54 +00:00

response_team

Forgot ERT, moved the boxes to boxes.dm

2018-11-10 12:08:06 +01:00

ruins

…

scripting

…

security_levels

…

shuttle

…

space_management

We now name space

2018-11-08 14:01:11 -05:00

spacepods

Items dropped in a pod will now stay in the pod.

2018-10-29 20:31:11 +01:00

station_goals

…

store

…

surgery

Remove catgirls

2018-11-08 20:58:04 -08:00

telesci

Ansari's changes

2018-11-06 23:45:49 +00:00

tooltip

…

tram

…

vehicle

…

vr

…