From: MirceaKitsune Date: Tue, 7 Sep 2010 13:18:50 +0000 (+0300) Subject: More fixes to Voretemple, and getting ready to do a change in the shader X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=99d85b821ec47294723c52d860a8f8c31457fca2 More fixes to Voretemple, and getting ready to do a change in the shader --- diff --git a/data/maps/voretemple.map b/data/maps/voretemple.map index 329dbbe7..002d67e3 100644 --- a/data/maps/voretemple.map +++ b/data/maps/voretemple.map @@ -22668,7 +22668,7 @@ common/invisible "classname" "trigger_multiple" "wait" "2" "angle" "0" -"message" "^3Illegal merchant: ^7Ok, listen up. We're not allowed to sell these here, so don't you dare tell the guards about it! I have a bunch of grabbers and some fuel, if you are interesting. And make sure to holster them when going outside!\n\nOh yeah, and if you're wondering, I'm keeping them in my stomach. Don't get fooled however... the guards did search me even there once! I mean really... most illegal merchants do this nowadays, and the guards know about it. Like it's not hard enough to just keep all this metal in my stomach..." +"message" "^3Illegal merchant: ^7Ok, listen up. We're not allowed to sell these here, so don't you dare tell the guards about it! I have a bunch of grabbers and some fuel, if you are interested. And make sure to holster them when going outside!\n\nOh yeah, and if you're wondering, I'm keeping them in my stomach. Don't get fooled however... the guards did search me even there once! I mean really... most illegal merchants do this nowadays, and the guards know about it. Like it's not hard enough to just keep all this metal in my stomach..." // brush 0 { ( -2768 496 80 ) ( -2736 496 80 ) ( -2768 464 80 ) common/trigger 0 0 0 0.5 0.5 0 0 0 diff --git a/data/scripts/artwork.shader b/data/scripts/artwork.shader index 5a84d104..62d5e698 100644 --- a/data/scripts/artwork.shader +++ b/data/scripts/artwork.shader @@ -1,3 +1,7 @@ +// ---------------------------------------------------------------- +// Artwork slots for the map Vore Temple: +// ---------------------------------------------------------------- + textures/artwork/slot_1 { qer_editorimage textures/artwork/artwork_slot.png