Crazy Lemon 8597adba1b Merge pull request #10089 from variableundefined/SplitSpriteAccessories ...

[READY] Refactor & Split up the sprite_accessories, body_accessories& human_face files

2018-11-11 21:23:34 -08:00

..

admin

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

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

alarm

…

antagonists

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

arcade

Merge pull request #10076 from variableundefined/Addcards

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

assembly

Cleans up assembly code

2018-10-27 13:29:07 +01:00

atmos_automation

Merge branch 'master' into RelPath

2018-10-12 14:08:19 +08:00

awaymissions

itsa me, the space-a bar

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

buildmode

Re-implements BM offsets in a 511-compatible manner

2018-10-16 20:10:03 -07:00

busy_space

…

client

Remove catgirls

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

clothing

Merge pull request #10166 from tigercat2000/updateicons

2018-11-11 12:09:30 +08:00

countdown

global lists global defined

2018-10-02 15:52:46 -05:00

crafting

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

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

customitems

Initial

2018-11-02 13:31:25 -07:00

detective_work

Forgot ERT, moved the boxes to boxes.dm

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

economy

global lists global defined

2018-10-02 15:52:46 -05:00

error_handler

…

events

Merge pull request #9888 from Fox-McCloud/spark-refactor

2018-10-19 08:41:03 +08:00

examine

fixies

2018-10-11 22:02:23 +01:00

ext_scripts

Station name and no hashes

2018-10-05 17:36:28 +01:00

fancytitle

…

fish

Deconflict 1

2018-10-21 07:56:55 +08:00

flufftext

Resolves conflicts.

2018-10-11 05:36:22 -05:00

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

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

holiday

global lists global defined

2018-10-02 15:52:46 -05:00

hydroponics

Requested changes

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

karma

global lists global defined

2018-10-02 15:52:46 -05:00

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

moves boxing attack logs to the ALL preference

2018-10-12 23:28:04 -04:00

mining

Merge pull request #10192 from farie82/Mining-bot-shoot

2018-11-12 08:41:45 +08:00

mob

Merge pull request #10089 from variableundefined/SplitSpriteAccessories

2018-11-11 21:23:34 -08:00

modular_computers

Fixed it

2018-10-24 22:54:14 +02:00

nano

Resolves conflicts.

2018-10-11 05:36:22 -05:00

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

Ghosts and other anchored mobs can no longer speed up conveyors

2018-11-09 00:35:33 +00: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

Keeps img functionality in chat while fixing the other exploit

2018-10-09 22:25:58 +01:00

security_levels

Resolves conflicts.

2018-10-11 05:36:22 -05:00

shuttle

Merge remote-tracking branch 'refs/remotes/origin/master' into smoothing-improvements

2018-10-13 21:34:04 +01:00

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

Merge pull request #9814 from Agameofscones/DNA_sampler_QOL

2018-10-19 07:44:37 +08:00

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

WEEWOO FIX

2018-10-09 15:26:44 -04:00

vr

Resolves conflicts.

2018-10-11 05:36:22 -05:00