FalseIncarnate 5823b354df merge conflicts

2018-07-01 02:42:31 -04: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

Cut code duplication, added sprites

2018-06-29 20:22:22 +02:00

countdown

…

crafting

…

customitems

merge conflicts

2018-07-01 02:42:31 -04: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

Merge remote-tracking branch 'upstream/master' into weather-subsystem

2018-06-13 16:56:19 -04: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

Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett

2018-06-30 22:11:05 -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

coin string fix

2018-06-17 18:14:52 -07:00

mob

Merge pull request #8895 from matt81093/death_squid

2018-06-22 00:09:02 -07:00

modular_computers

…

nano

…

ninja

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

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

paperwork

Merge branch 'master' into LabelerLogging

2018-06-30 20:19:53 -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

Merge pull request #9047 from Citinited/conveyor-belt-placer

2018-06-29 21:11:49 -07:00

research

Merge pull request #9047 from Citinited/conveyor-belt-placer

2018-06-29 21:11:49 -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

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

2018-05-31 19:34:47 -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

…