variableundefined bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls ...

(TGCRP) - /tg/ catgirl refugee program

2018-10-27 11:00:34 +08:00

..

admin

Merge pull request #10000 from tigercat2000/literally_catgirls

2018-10-27 11:00:34 +08:00

alarm

…

antagonists

Refactors Spark Spread Activation

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

arcade

Resolved merge conflicts... I hope.

2018-10-06 16:01:34 +01:00

assembly

reformats assembly.dm and proximity.dm

2018-10-24 11:24:58 +01:00

atmos_automation

Merge branch 'master' into RelPath

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

awaymissions

Merge pull request #9719 from SamHPurp/smoothing-improvements

2018-10-21 07:41:47 +08:00

buildmode

Re-implements BM offsets in a 511-compatible manner

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

busy_space

…

client

Nyaaaaa~

2018-10-25 19:59:30 -07:00

clothing

Nyaaaaa~

2018-10-25 19:59:30 -07:00

countdown

global lists global defined

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

crafting

TG container_type refactor

2018-10-13 08:20:52 +08:00

customitems

Resolves conflicts.

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

detective_work

TG container_type refactor

2018-10-13 08:20:52 +08:00

economy

global lists global defined

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

error_handler

Ensure admin\topic.dm uses mostly locateUID

2018-08-17 20:06:22 +02:00

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

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

2018-10-24 02:21:36 -04: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

Deconflict 1

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

karma

global lists global defined

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

library

Fixes a bunch of shown messages

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

lighting

Move lighting to it's own plane, fix observers

2018-10-25 15:48:03 -07:00

logic

…

map_fluff

…

martial_arts

moves boxing attack logs to the ALL preference

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

mining

Merge pull request #9864 from variableundefined/ManualRevert

2018-10-19 19:16:00 -04:00

mob

Merge pull request #10000 from tigercat2000/literally_catgirls

2018-10-27 11:00: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

Deconflict 1

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

pda

refactors global lists.

2018-10-06 08:02:45 -05:00

persistence

Adds extra documentation for json_to_object

2016-08-10 23:54:17 -07:00

power

Refactors Spark Spread Activation

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

procedural_mapping

…

projectiles

Deconflict 1

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

reagents

Merge pull request #10000 from tigercat2000/literally_catgirls

2018-10-27 11:00:34 +08:00

recycling

Merge branch 'master' into RelPath

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

research

Merge pull request #9081 from tigercat2000/multivis

2018-10-25 09:45:02 +08:00

response_team

adds nullrod to gamma paranormal

2018-10-12 15:41: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

…

spacepods

numbers round the wrong way

2018-10-20 11:05:53 +01:00

station_goals

Merge pull request #9814 from Agameofscones/DNA_sampler_QOL

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

store

…

surgery

Nyaaaaa~

2018-10-25 19:59:30 -07:00

telesci

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04: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