MASMC d682ecacfa Fixes ore boxes picking up strange rocks ...

Simple name check fix. Nothing should fill up, as the rock "bounces" out
of the crate. Enjoy.

2019-07-06 18:40:42 -04:00

..

admin

Merge remote-tracking branch 'upstream/master'

2019-06-05 00:25:36 +01:00

ai

Replaces different AI with shutters

2019-06-11 07:11:20 +10:00

alarm

…

artifice

…

assembly

…

awaymissions

…

blob

…

blob2

tinytweaks

2019-06-21 17:07:51 -04:00

busy_space

…

busy_space_vr

…

catalogue

And to exploration vendor too

2019-07-02 12:10:50 +10:00

client

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

clothing

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

customitems

…

detectivework

…

DMAPI

…

economy

…

entopics_vr

…

error_handler

…

events

Merge pull request #6182 from mistyLuminescence/eventroundstart

2019-05-28 14:24:35 -04:00

examine

…

ext_scripts

…

fishing

Merge pull request #5320 from Ketrai/fishingrod

2019-06-18 17:50:55 -04:00

flufftext

…

food

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

gamemaster

Update planet_weather_change.dm

2019-06-21 15:13:01 -04:00

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

…

hydroponics

Merge remote-tracking branch 'upstream/master'

2019-06-11 02:34:25 +01:00

icon generation

…

identification

…

integrated_electronics

Merge pull request #6224 from MagmaRam/IC_input_fix

2019-06-21 18:26:35 -04:00

interserver shipping

…

library

…

lighting

An assortment of Lighting Stuff

2019-06-18 19:57:40 -04:00

lore_codex

Merge pull request #6234 from Cerebulon/newsJune19

2019-06-28 20:12:47 -04:00

maps

…

materials

Merge pull request #6249 from Heroman3003/lead-stack

2019-07-01 20:48:45 -04:00

media

…

metric

Merge pull request #6219 from Mechoid/Event_Retweakening

2019-06-19 23:34:26 -04:00

mining

Fixes ore boxes picking up strange rocks

2019-07-06 18:40:42 -04:00

mob

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

modular_computers

Merge pull request #6247 from mistyLuminescence/zruntime

2019-07-01 20:46:10 -04:00

multi-tile

Multi-Tile Objects, Multi-Tile Hovershuttle

2019-07-01 20:43:53 -04:00

multiz

…

nano

…

nifsoft

…

organs

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

overmap

…

paperwork

…

persistence

…

Phorochemistry

…

planet

…

power

Fix for non-compile.

2019-07-02 19:04:53 +01:00

projectiles

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

random_map

…

reagents

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

recycling

…

research

Merge pull request #6248 from Heroman3003/gpsing

2019-07-01 20:47:22 -04:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

surgery

…

tables

…

telesci

…

tension

…

tooltip

…

turbolift

…

vehicles

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

ventcrawl

…

virus2

Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

2019-05-13 22:57:23 -04:00

vore

Switching File Location

2019-06-17 16:34:51 -04:00

xenoarcheaology

Merge remote-tracking branch 'upstream/master'

2019-07-02 17:54:29 +01:00

xenobio

…

xenobio2

…

xgm

…