Merge remote-tracking branch 'origin/Mirio/runningman'

diff --git a/maps/runningman.map b/maps/runningman.map
index 4fbab50f208a0f46d0d560e7c754c239dd08a245..9f42cac6ee6b0cd55de83b9aed4bb2152ed51dfa 100644 (file)
--- a/maps/runningman.map
+++ b/maps/runningman.map
@@ -7617,12 +7617,12 @@ decals/scorch02
 ( 1024 -128 448 ) ( 1008 -128 448 ) ( 1008 -640 448 ) common/caulk 0 0 90 0.25 -0.25 0 0 0
 }
 {
-( 928 -544 640 ) ( 928 -128 640 ) ( 1280 -128 640 ) common/caulk 0 0 90 0.25 -0.25 0 0 0
-( 992 -223 384 ) ( 1056 -159 384 ) ( 1056 -159 672 ) trak4x/decal-northwing 129 85.3333740234 0 -0.5 0.75 0 0 0
-( 1280 0 512 ) ( 1264 -16 512 ) ( 1280 0 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 864 -288 64 ) ( 896 -320 -64 ) ( 864 -288 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 992 -160 -64 ) ( 1024 -192 -64 ) ( 992 -160 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 1024 -128 448 ) ( 1008 -128 448 ) ( 1008 -640 448 ) common/caulk 0 0 90 0.25 -0.25 0 0 0
+( 928 -544 640 ) ( 928 -128 640 ) ( 1280 -128 640 ) common/caulk 0 0 90 0.25 -0.25 134217728 0 0
+( 992 -223 384 ) ( 1056 -159 384 ) ( 1056 -159 672 ) trak4x/decal-northwing 129 85.3333740234 0 -0.5 0.75 134217728 0 0
+( 1280 0 512 ) ( 1264 -16 512 ) ( 1280 0 640 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 864 -288 64 ) ( 896 -320 -64 ) ( 864 -288 -64 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
+( 992 -160 -64 ) ( 1024 -192 -64 ) ( 992 -160 64 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
+( 1024 -128 448 ) ( 1008 -128 448 ) ( 1008 -640 448 ) common/caulk 0 0 90 0.25 -0.25 134217728 0 0
 }
 {
 ( 672 64 -224 ) ( 640 80 -224 ) ( 672 80 -224 ) exx/base-metal03 448 0 90 0.25 -0.25 0 0 0
@@ -16116,13 +16116,6 @@ effects_healpod/healpod1_d
 }
 {
 "classname" "misc_model"
-"origin" "-544.000000 -488.000031 0.000000"
-"model" "models/containers/barrel01.md3"
-"spawnflags" "2"
-"angle" "0.000003"
-}
-{
-"classname" "misc_model"
 "origin" "-512.150635 -352.299103 -216.000076"
 "model" "models/xonotic_jumppad01/xonotic_jumppad01.md3"
 "angles" "0.000002 -76.533272 -26.603931"
@@ -16368,3 +16361,75 @@ exx/panel-q201
 "origin" "459.253052 -994.742371 -81.471077"
 "angles" "8.84399414 134.664917 0"
 }
+{
+"classname" "misc_breakablemodel"
+"origin" "-544.000000 -480.000000 0.000000"
+"model" "models/containers/barrel01.md3"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+"modelscale_vec" "1.000000 1.000000 1.200000"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "-504.000000 -472.000000 0.000000"
+"model" "models/containers/barrel01.md3"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+"modelscale_vec" "1.000000 1.000000 1.200000"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "-688.000000 -312.000000 0.000000"
+"model" "models/containers/barrel01.md3"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"noise" "sound/weapons/rocket_impact.ogg"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_radius" "150"
+"dmg_force" "600"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"debrisfadetime" "1"
+"debrisdamageforcescale" "1"
+"respawntime" "40"
+"respawntimejitter" "10"
+"modelscale_vec" "1.000000 1.000000 1.200000"
+}