Index: code/model/modelanim.cpp
===================================================================
--- code/model/modelanim.cpp	(revision 10819)
+++ code/model/modelanim.cpp	(working copy)
@@ -840,16 +840,18 @@
 		psub = pss->system_info;
 
 		for (i = 0; i < psub->n_triggers; i++) {
-			if (psub->type == SUBSYSTEM_TURRET) {
-				// special case for turrets
-				pss->submodel_info_2.angs.p = psub->triggers[i].angle.xyz.x;
-				pss->submodel_info_1.angs.h = psub->triggers[i].angle.xyz.y;
-			} else if (psub->triggers[i].type == TRIGGER_TYPE_INITIAL) {
-				Assert(pss->triggered_rotation_index >= 0);
-				triggered_rotation *tr = &Triggered_rotations[pss->triggered_rotation_index];
+			if (psub->triggers[i].type == TRIGGER_TYPE_INITIAL) {
+				if (psub->type == SUBSYSTEM_TURRET) {
+					// special case for turrets
+					pss->submodel_info_2.angs.p = psub->triggers[i].angle.xyz.x;
+					pss->submodel_info_1.angs.h = psub->triggers[i].angle.xyz.y;
+				} else {
+					Assert(pss->triggered_rotation_index >= 0);
+					triggered_rotation *tr = &Triggered_rotations[pss->triggered_rotation_index];
 
-				tr->set_to_initial(&psub->triggers[i]);
-				tr->apply_trigger_angles(&pss->submodel_info_1.angs);
+					tr->set_to_initial(&psub->triggers[i]);
+					tr->apply_trigger_angles(&pss->submodel_info_1.angs);
+				}
 			}
 		}
 	}

Index: code/ship/ship.cpp
===================================================================
--- code/ship/ship.cpp	(revision 10819)
+++ code/ship/ship.cpp	(working copy)
@@ -12262,9 +12262,7 @@
 			case SUBSYSTEM_SOLAR:
 			case SUBSYSTEM_GAS_COLLECT:
 			case SUBSYSTEM_ACTIVATION:
-				break;
 			case SUBSYSTEM_TURRET:
-				Assertion( !(psub->flags & MSS_FLAG_ROTATES), "Turret %s on ship %s has the $rotate or $triggered subobject property defined. Please fix the model.\n", psub->name, Ship_info[shipp->ship_info_index].name ); // Turrets can't rotate!!! See John!
 				break;
 			default:
 				Error(LOCATION, "Illegal subsystem type.\n");