diff --git a/.forgejo/workflows/pk3.yaml b/.forgejo/workflows/pk3.yaml
index 75d5cf8..449d8a5 100644
--- a/.forgejo/workflows/pk3.yaml
+++ b/.forgejo/workflows/pk3.yaml
@@ -10,14 +10,14 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
-		repository: vera/nuclide
-		ref: Develop
+        repository: vera/nuclide
+        ref: Develop
 
     - uses: actions/checkout@v3
       with:
         fetch-depth: 1
-		ref: Develop
-		path: "./${{ github.event.repository.name }}"
+        ref: Develop
+        path: "./${{ github.event.repository.name }}"
 
     - name: assemble pk4
       run: make dist-pak NAME=bin GAME=${{ github.event.repository.name }}
diff --git a/src/rules/deathmatch.qc b/src/rules/deathmatch.qc
index 0545ca1..6dabc0a 100644
--- a/src/rules/deathmatch.qc
+++ b/src/rules/deathmatch.qc
@@ -63,7 +63,14 @@ CodeCallback_StartGameType(void)
 	}
 
 	for (entity s = world; (s = ents.NextItem(s));) {
-		ents.Input(s, "SetRespawnTime", "30.0f", world);
+		string isWeapon = substring(s.classname, 0, 7);
+		string isAmmo = substring(s.classname, 0, 5);
+
+		if (isWeapon == "weapon_" || isAmmo == "ammo_") {
+			ents.Input(s, "SetRespawnTime", "20.0f", world);
+		} else {
+			ents.Input(s, "SetRespawnTime", "30.0f", world);
+		}
 	}
 }