Kyep 3fb7a5e526 Merge remote-tracking branch 'ParadiseSS13/master' into depot

2018-06-28 18:02:48 -07:00

..

admin

Merge pull request #9064 from Anasari/MoreClickAntag

2018-06-13 18:43:18 -07:00

alarm

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

antagonists

…

arcade

…

assembly

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

atmos_automation

…

awaymissions

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

busy_space

…

client

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

clothing

Customize Honk Sound for Clown Uniform

2018-06-19 23:46:57 -04:00

countdown

…

crafting

…

customitems

Merge pull request #9057 from Aurorablade/PanzerSkullFluff

2018-06-13 13:48:18 -07:00

detective_work

…

economy

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

error_handler

…

events

fixes grid check causing blue

2018-06-23 19:27:21 -07:00

examine

…

ext_scripts

…

fancytitle

…

fish

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

flufftext

Their

2018-05-25 18:34:24 -07:00

food_and_drinks

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

holiday

…

hydroponics

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

karma

…

library

Fix his, he, him

2018-05-25 18:34:28 -07:00

lighting

…

logic

…

map_fluff

…

martial_arts

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

mining

Merge remote-tracking branch 'ParadiseSS13/master' into depot

2018-06-28 18:02:48 -07:00

mob

Merge remote-tracking branch 'ParadiseSS13/master' into depot

2018-06-28 18:02:48 -07:00

modular_computers

Removes the last of the color macros

2018-05-23 14:05:17 -04:00

nano

…

ninja

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

paperwork

fix docs, change timing

2018-06-17 21:39:17 -07:00

pda

…

persistence

…

power

Better method of deffered processing

2018-06-18 12:10:16 -07:00

procedural_mapping

…

projectiles

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

reagents

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

recycling

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

research

Merge pull request #8969 from Fox-McCloud/surgery-set

2018-06-13 16:24:53 -07:00

ruins

…

scripting

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

2018-06-07 15:04:57 -07:00

security_levels

…

shuttle

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

space_management

…

spacepods

squash

2018-06-17 07:54:17 -07:00

station_goals

…

store

…

surgery

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

telesci

…

tooltip

…

tram

…

vehicle

…

vr

…