From 8a140379db69570533b4496ae8be89a16c66afcb Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Sat, 24 Dec 2016 15:15:39 +0100 Subject: Add CREDITS and the speaker model. --- CREDITS | 3 +++ blender/speaker.blend | Bin 0 -> 490264 bytes maps/p2_clockroom.map | 33 ++++++++++++++++++++++++++++++++ models/mapobjects/analmango/speaker.jpg | Bin 0 -> 3457 bytes models/mapobjects/analmango/speaker.md3 | Bin 0 -> 6364 bytes 5 files changed, 36 insertions(+) create mode 100644 CREDITS create mode 100644 blender/speaker.blend create mode 100644 models/mapobjects/analmango/speaker.jpg create mode 100644 models/mapobjects/analmango/speaker.md3 diff --git a/CREDITS b/CREDITS new file mode 100644 index 0000000..a5756cf --- /dev/null +++ b/CREDITS @@ -0,0 +1,3 @@ +sound/analmango/analmango.wav contains the following sound: + http://freesound.org/people/gollamar/sounds/273230/ + "Announcement-05.wav" by gollamar, CC-BY diff --git a/blender/speaker.blend b/blender/speaker.blend new file mode 100644 index 0000000..342d93b Binary files /dev/null and b/blender/speaker.blend differ diff --git a/maps/p2_clockroom.map b/maps/p2_clockroom.map index 95be6b5..7958bc8 100644 --- a/maps/p2_clockroom.map +++ b/maps/p2_clockroom.map @@ -4781,6 +4781,15 @@ nexus6/barrel_rst_top ( 80 -368 -72 ) ( 80 -384 -304 ) ( 80 -368 -304 ) common/caulk 0 0 0 0.5 0.5 0 0 0 ( 80 -384 -304 ) ( 240 -384 -304 ) ( 240 -368 -304 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } +// brush 503 +{ +( 144 -1080 80 ) ( 144 -1088 80 ) ( 112 -1080 80 ) common/full_clip 0 0 0 0.5 0.5 0 0 0 +( 144 -1064 80 ) ( 112 -1064 80 ) ( 144 -1064 48 ) common/full_clip 0 16 0 0.5 0.5 0 0 0 +( 144 -1080 80 ) ( 144 -1080 48 ) ( 144 -1088 80 ) common/full_clip 0 16 0 0.5 0.5 0 0 0 +( 112 -1088 48 ) ( 144 -1088 48 ) ( 112 -1080 48 ) common/full_clip 0 0 0 0.5 0.5 0 0 0 +( 112 -1096 48 ) ( 112 -1096 80 ) ( 144 -1096 48 ) common/full_clip 0 16 0 0.5 0.5 0 0 0 +( 112 -1088 48 ) ( 112 -1080 48 ) ( 112 -1088 80 ) common/full_clip 0 16 0 0.5 0.5 0 0 0 +} } // entity 1 { @@ -5237,3 +5246,27 @@ nexus6/barrel_rst_top ( -548 -744 80 ) ( -548 -664 80 ) ( -548 -744 168 ) niveus/base_yellow 76.8001098633 232.7272949219 0 0.3125 0.34375 0 0 0 } } +// entity 33 +{ +"classname" "misc_model" +"origin" "127.000000 -1089.000000 88.000000" +"model" "models/mapobjects/analmango/speaker.md3" +"angle" "90.000000" +"spawnflags" "1" +} +// entity 34 +{ +"classname" "target_speaker" +"origin" "128.000000 -1080.000000 64.000000" +"targetname" "global_speaker" +"noise" "sound/analmango/analmango.wav" +} +// entity 35 +{ +"classname" "func_timer" +"origin" "184.000000 -1000.000000 64.000000" +"target" "global_speaker" +"spawnflags" "1" +"wait" "120" +"random" "60" +} diff --git a/models/mapobjects/analmango/speaker.jpg b/models/mapobjects/analmango/speaker.jpg new file mode 100644 index 0000000..5aaed80 Binary files /dev/null and b/models/mapobjects/analmango/speaker.jpg differ diff --git a/models/mapobjects/analmango/speaker.md3 b/models/mapobjects/analmango/speaker.md3 new file mode 100644 index 0000000..91c1651 Binary files /dev/null and b/models/mapobjects/analmango/speaker.md3 differ -- cgit