diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp index b4e6907e499..f644456e039 100644 --- a/code/ship/ship.cpp +++ b/code/ship/ship.cpp @@ -1687,6 +1687,14 @@ static void parse_ship(const char *filename, bool replace) stuff_string(template_name, F_NAME, SHIP_MULTITEXT_LENGTH); int template_id = ship_template_lookup(template_name); if ( template_id != -1 ) { + if (ship_id >= 0) { + error_display(2, + "A template was specified for ship class '%s', which already exists. Template '%s' replaces " + "the whole existing entry, not only the values it sets. To change only some values, list " + "them without '+Use Template:'.", + fname, + template_name); + } first_time = false; sip->clone(Ship_templates[template_id]); strcpy_s(sip->name, fname);