Merge branch 'main' of https://github.com/nzp-team/assets

nzp-team · Dec 13, 2023 · 052bf74 · 052bf74
2 parents 4bb5f3f + 8947b69
commit 052bf74
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/common/maps/nzp_warehouse2.way b/common/maps/nzp_warehouse2.way
@@ -1667,7 +1667,7 @@ Waypoint
 {
 origin = '-559 -650 476'
 id = 111
-special = 
+special = Catwalk
 target = 110
 target2 = 112
 target3 = 14

diff --git a/common/models/weapons/m1carbine/v_m1a1.mdl b/common/models/weapons/m1carbine/v_m1a1.mdl
diff --git a/source/maps/fgd/hl-nzp.fgd b/source/maps/fgd/hl-nzp.fgd
@@ -737,10 +737,12 @@
 @PointClass size(-32 -8 -8, 32 8 8) base(Item, Appearflags) color(151 104 34) studio("models/machines/mystery.mdl") = 
 	mystery_box_tp_spot : "Mystery Box Possible Spawn Point" []
 
-@PointClass size(-28 -28 -64, 28 28 40 ) base(Item, Appearflags) color(114 224 172) studio() = item_barricade : "Window Boards" 
+@PointClass size(-28 -28 -64, 28 28 40 ) base(Item, Appearflags) color(114 224 172) studio() = item_barricade : "Window Barricade" 
 [
 	model(studio) : "Model" : "models/misc/window.mdl"
 	skin(integer) : "Skin" : 0
+	health(integer) : "Starting Boards (-1 for none)" : 6
+	health_delay(integer) : "Max/Repairable Boards" : 6
 	oldmodel(string) : "Rebuild Sound" : "sounds/misc/barricade.wav"
 	aistatus(string) : "Destroy Sound" : "sounds/misc/barricade_destroy.wav"
 	spawnflags(Flags) =

diff --git a/source/maps/fgd/tb-nzp.fgd b/source/maps/fgd/tb-nzp.fgd
@@ -737,10 +737,12 @@
 @PointClass size(-32 -8 -8, 32 8 8) base(Item, Appearflags) color(151 104 34) model("models/machines/mystery.mdl") = 
 	mystery_box_tp_spot : "Mystery Box Possible Spawn Point" []
 
-@PointClass size(-28 -28 -64, 28 28 40 ) base(Item, Appearflags) color(114 224 172) model({{ model != Null -> model, {"path":"models/misc/window.mdl"} }}) = item_barricade : "Window Boards" 
+@PointClass size(-28 -28 -64, 28 28 40 ) base(Item, Appearflags) color(114 224 172) model({{ model != Null -> model, {"path":"models/misc/window.mdl"} }}) = item_barricade : "Window Barricade" 
 [
 	model(model) : "Model" : "models/misc/window.mdl"
 	skin(integer) : "Skin" : 0
+	health(integer) : "Starting Boards (-1 for none)" : 6
+	health_delay(integer) : "Max/Repairable Boards" : 6
 	oldmodel(string) : "Rebuild Sound" : "sounds/misc/barricade.wav"
 	aistatus(string) : "Destroy Sound" : "sounds/misc/barricade_destroy.wav"
 	spawnflags(Flags) =

diff --git a/source/models/weapons/m1carbine/v_m1a1/mesh.blend b/source/models/weapons/m1carbine/v_m1a1/mesh.blend