Couls 411a6ecec7 some more tweaks

2019-07-01 03:04:24 -04:00

..

admin

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

alarm

…

antagonists

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

arcade

Resolve conflicts

2019-05-03 22:28:04 -04:00

assembly

…

atmos_automation

…

awaymissions

More portal fixes

2019-06-03 21:57:00 +02:00

buildmode

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

busy_space

…

client

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

clothing

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

countdown

…

crafting

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

customitems

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

detective_work

…

economy

Removes unused hooks

2019-05-05 10:28:56 +01:00

error_handler

…

events

Tesla wormhole fix

2019-06-06 17:14:34 +02:00

examine

…

ext_scripts

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

fancytitle

…

fish

…

flufftext

Resolve conflicts

2019-05-03 22:28:04 -04:00

food_and_drinks

Add reagents to goliath_steak

2019-06-04 10:11:12 +02:00

games

…

holiday

…

hydroponics

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

karma

…

keybindings

use \ref until I can figure something out for UID

2019-05-22 14:42:06 -04:00

library

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

lighting

Fix dynamic lighting on shuttles

2019-05-04 05:51:13 +02:00

logic

…

map_fluff

…

martial_arts

…

mining

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-22 03:54:43 -04:00

mob

some more tweaks

2019-07-01 03:04:24 -04:00

modular_computers

Removes unused hooks

2019-05-05 10:28:56 +01:00

nano

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

ninja

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

paperwork

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

pda

Resolve conflicts

2019-05-03 22:28:04 -04:00

persistence

…

power

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-22 03:54:43 -04:00

procedural_mapping

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

projectiles

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

reagents

Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix

2019-06-03 21:44:01 +02:00

recycling

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

research

Resolve conflicts

2019-05-03 22:28:04 -04:00

response_team

Merge pull request #11486 from Tayyyyyyy/better_ert_spawn

2019-05-17 23:07:30 +08:00

ruins

Fix mask path

2019-06-03 22:59:15 +02:00

security_levels

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

shuttle

More portal fixes

2019-06-03 21:57:00 +02:00

space_management

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

spacepods

…

station_goals

…

store

…

surgery

Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix

2019-06-03 17:39:23 +02:00

telesci

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

tooltip

…

tram

More portal fixes

2019-06-03 21:57:00 +02:00

vehicle

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00

vr

Merge remote-tracking branch 'upstream/master' into diagonal-movement

2019-06-02 21:59:58 -04:00