<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
		<id>https://wiki.obsidianconflict.net/api.php?action=feedcontributions&amp;feedformat=atom&amp;user=Shana</id>
		<title>Obsidian Conflict Wiki - User contributions [en]</title>
		<link rel="self" type="application/atom+xml" href="https://wiki.obsidianconflict.net/api.php?action=feedcontributions&amp;feedformat=atom&amp;user=Shana"/>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Special:Contributions/Shana"/>
		<updated>2026-05-09T04:53:00Z</updated>
		<subtitle>User contributions</subtitle>
		<generator>MediaWiki 1.30.0</generator>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team/es&amp;diff=1661</id>
		<title>Obsidian Conflict Team/es</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team/es&amp;diff=1661"/>
				<updated>2018-01-21T09:40:24Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
== Lider ==&lt;br /&gt;
[[User:Shana | Shana]] - Líder del mod&lt;br /&gt;
&lt;br /&gt;
== Programadores ==&lt;br /&gt;
[[User:Neico | Neico]] - Programador líder&lt;br /&gt;
&lt;br /&gt;
[[User:TESLA-X4 | TESLA-X4]] - Programador&lt;br /&gt;
&lt;br /&gt;
[[User:Z33ky | Z33ky]] - Programador&lt;br /&gt;
&lt;br /&gt;
== Mapeadores ==&lt;br /&gt;
[[User:Tysn | Tysn]] - Mapeador líder&lt;br /&gt;
&lt;br /&gt;
[[User:Shana | Shana]] - Mapeador&lt;br /&gt;
&lt;br /&gt;
== Modeladores ==&lt;br /&gt;
[[User:Nirrti | Nirrti]] - Modelador&lt;br /&gt;
&lt;br /&gt;
[[User:Vesuvian | Vesuvian]] - Modelador&lt;br /&gt;
&lt;br /&gt;
== Animadores ==&lt;br /&gt;
[[User:Linkmister | Linkmister]] - Animador&lt;br /&gt;
&lt;br /&gt;
== Miscelaneo ==&lt;br /&gt;
[[User:Lt_Commander | Lt_Commander]] - Artista 2D&lt;br /&gt;
&lt;br /&gt;
== Traductores ==&lt;br /&gt;
'''''Nota:''''' Estas personas no son realmente parte del '''Equipo de Obsidian Conflict''' pero merecen aparecer en los créditos.&lt;br /&gt;
Si deseas traducir a un idioma que hables bien y que no está en la lista, no dudes en contactar con [[User:Neico | Neico]].&lt;br /&gt;
&lt;br /&gt;
'''''Los idiomas Inglés y Alemán ya están a cargo del equipo.'''''&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - Japonés&lt;br /&gt;
&lt;br /&gt;
[[User:Snowman7 | Snowman7]] - Japonés&lt;br /&gt;
&lt;br /&gt;
[[User:JerC | JerC]] - ¿Francés? (no se ha establecido aún, pero podría ser ...)&lt;br /&gt;
&lt;br /&gt;
== Contribuyentes de contenido ==&lt;br /&gt;
'''''Nota:''''' Son personas que han dado contenido y esfuerzo en el mod pero no son parte del '''Equipo de Obsidian Conflict'''.&lt;br /&gt;
&lt;br /&gt;
[[User:Romka | Romka]] - Modelador (Gordon Player Model)&lt;br /&gt;
&lt;br /&gt;
[[User:Power-Mad | Power-Mad]] - Mapeador (oc_starlight)&lt;br /&gt;
&lt;br /&gt;
[[User:Hickadam | Hickadam]] - Mapeador (oc_evildead,oc_cannon)&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - Mapeador (oc_umizuri,oc_damanku,oc_kake,coop_zelda)&lt;br /&gt;
&lt;br /&gt;
[[User:Keychain | Keychain]] - Creador del trailer (1.35 Teaser Trailer)&lt;br /&gt;
&lt;br /&gt;
[[User:Rob | Rob]] - Actor de voz (ep2_oc_broken_escape_02b/broken_escape_02c)&lt;br /&gt;
&lt;br /&gt;
== Ex Miembros ==&lt;br /&gt;
[[User:Skidz | Skidz]] - Líder del Mod y programador&lt;br /&gt;
&lt;br /&gt;
[[User:Hyperjag3 | Hyperjag3]] - Programador líder&lt;br /&gt;
&lt;br /&gt;
[[User:Barnz | Barnz]] - Modelador&lt;br /&gt;
&lt;br /&gt;
[[User:DaMaN | DaMaN]] - Mapeador&lt;br /&gt;
&lt;br /&gt;
== Notas adicionales ==&lt;br /&gt;
* Si falta alguien en la lista, no dudes en preguntar a [[User:Shana| Shana]] o a [[User:Neico | Neico]] para que lo añadan.&lt;br /&gt;
* Si quieres hablar sobre esta página, su disño, etc, no dudes en usar la [http://wiki.obsidianconflict.net/?title=Talk:Obsidian_Conflict_Team página de discusiones]&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Oc_castledefense/zh-hans&amp;diff=1660</id>
		<title>Oc castledefense/zh-hans</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Oc_castledefense/zh-hans&amp;diff=1660"/>
				<updated>2018-01-21T09:39:50Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{oc_map}}&lt;br /&gt;
[[Image:Oc_castledefense.jpg|thumb|right|256px]]&lt;br /&gt;
==Map Info==&lt;br /&gt;
{| cellspacing=&amp;quot;4&amp;quot; cellpadding=&amp;quot;1&amp;quot;&lt;br /&gt;
| '''地图名称''' || oc_castledefense&lt;br /&gt;
|-&lt;br /&gt;
| '''作者''' || [[User:Shana|Shana]]&lt;br /&gt;
|-&lt;br /&gt;
| '''类型''' || 防守&lt;br /&gt;
|-&lt;br /&gt;
| '''建议玩家''' || 2-16&lt;br /&gt;
|-&lt;br /&gt;
|}&lt;br /&gt;
&lt;br /&gt;
== 任务简介 ==&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Maps/zh-hans&amp;diff=1659</id>
		<title>Maps/zh-hans</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Maps/zh-hans&amp;diff=1659"/>
				<updated>2018-01-21T09:39:31Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;__TOC__&lt;br /&gt;
&lt;br /&gt;
以列表形式查看请点击 [[:Category:Oc_maps|here]]&lt;br /&gt;
== 官方地图 ==&lt;br /&gt;
以下的地图将会被打包在安装包里面的&lt;br /&gt;
=== 官方制作组 ===&lt;br /&gt;
&lt;br /&gt;
* [[Oc_antlion_attack|oc_antlion_attack]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_breakout|oc_breakout]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[oc_broken_escape|oc_broken_escape series]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[Oc_cardwar|oc_cardwar]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_castledefense|oc_castledefense]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[Oc_courier|oc_courier]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_fireteam|oc_fireteam series]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_freezingpoint|oc_freezingpoint]] by [[User:skidz|skidz]]&lt;br /&gt;
* [[Oc_harvest|oc_harvest]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_lobby|oc_lobby]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_manor|oc_manor]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_return_c17|oc_return_c17 series]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_seamus|oc_seamus]] by [[User:skidz|skidz]]&lt;br /&gt;
* [[Oc_starship_troopers|oc_starship_troopers]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_stitches|oc_stitches series]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_waking_dead|oc_waking_dead]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_wildfire|oc_wildfire]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Ocf_deadland|ocf_deadland]] by [[User:skidz|skidz]]&lt;br /&gt;
&lt;br /&gt;
=== 社区地图 ===&lt;br /&gt;
&lt;br /&gt;
* [[Oc_Bunker|oc_Bunker]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_cannon|oc_cannon series]] by [[User:Hickadam|Hickadam]]&lt;br /&gt;
* [[Oc_danmaku|oc_danmaku]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_docks|oc_docks]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_evildead|oc_evildead]] by [[User:Hickadam|Hickadam]]&lt;br /&gt;
* [[Oc_kake|oc_kake]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_newgappi|oc_newgappi]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_sewers|oc_sewers]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_starlight|oc_starlight]] by [[User:Powermad|Powermad]]&lt;br /&gt;
* [[Oc_umizuri|oc_umizuri]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_wgh|oc_wgh]] by [[User:Fox|Fox]]&lt;br /&gt;
* [[Oc_zelda|oc_zelda series]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Z_harrier2_f|z_harrier2_f]] by [[User:Zteer|Zteer]]&lt;br /&gt;
&lt;br /&gt;
=== 还在开发阶段 ===&lt;br /&gt;
* [[Oc_cadaverous|oc_cadaverous]] by [[User:Tysn|Tysn]]&lt;br /&gt;
&lt;br /&gt;
== 玩家自制地图 ==&lt;br /&gt;
以下的地图是由玩家自制&lt;br /&gt;
=== 已发布 ===&lt;br /&gt;
* [[Oc_junkfall|oc_junkfall]] by [[User:Saccn|Saccn]]&lt;br /&gt;
* [[Oc_diving|oc_diving]] by [[User:Beanbrains|Beanbrains]]&lt;br /&gt;
* [[Oc_paysan|oc_paysan]] by [[User:Sven|Sven]]&lt;br /&gt;
&lt;br /&gt;
=== 未发布 ===&lt;br /&gt;
 &lt;br /&gt;
* [[Oc_holdthefort|oc_holdthefort]] by [[User:Shiftey|Shiftey]]&lt;br /&gt;
* [[Oc_Oasis|oc_oasis]] by [[User:Gjsdeath|Gjsdeath]]&lt;br /&gt;
* [[Oc_Zombie_Survival|oc_zombie_survival]] by [[User:Gjsdeath|Gjsdeath]]&lt;br /&gt;
&lt;br /&gt;
=== 文本地图 ===&lt;br /&gt;
&lt;br /&gt;
* [[cs_militia|cs_militia]] by [[User:Gandorques Hikla|Gandorques Hikla]]&lt;br /&gt;
* [[de_chateau|de_chateau]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_dust|de_dust]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_nuke|de_nuke]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_port|de_port]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[de_prodigy|de_prodigy]] by [[User:fug4life|fug4life]]&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team/zh-hans&amp;diff=1658</id>
		<title>Obsidian Conflict Team/zh-hans</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team/zh-hans&amp;diff=1658"/>
				<updated>2018-01-21T09:38:49Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
&lt;br /&gt;
== 领队 ==&lt;br /&gt;
[[User:Shana | Shana]] - 领队&lt;br /&gt;
&lt;br /&gt;
== 代码编写 ==&lt;br /&gt;
[[User:Neico | Neico]] - 代码编写&lt;br /&gt;
&lt;br /&gt;
[[User:TESLA-X4 | TESLA-X4]] - 代码编写&lt;br /&gt;
&lt;br /&gt;
[[User:Z33ky | Z33ky]] - 代码编写&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
== 地图制作 ==&lt;br /&gt;
[[User:Tysn | Tysn]] - 地图制作领队&lt;br /&gt;
&lt;br /&gt;
[[User:Shana | Shana]] - 地图制作者&lt;br /&gt;
&lt;br /&gt;
== 模型制作 / 动作制作 ==&lt;br /&gt;
[[User:Linkmister | Linkmister]] - 动作制作领队&lt;br /&gt;
&lt;br /&gt;
[[User:Vesuvian | Vesuvian]] - 模型制作领队&lt;br /&gt;
&lt;br /&gt;
== 杂项 ==&lt;br /&gt;
&lt;br /&gt;
== 翻译 ==&lt;br /&gt;
'''''注意''''': 这些人不属于黑曜石战争官方制作团队,但是却值得在列表里.如果你翻译了一门语言,但是却没有出现在下面的列表里,请联系[[User:Neico | Neico]].&lt;br /&gt;
&lt;br /&gt;
'''''英语和德语将会交给官方制作组进行制作'''''&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - 日语&lt;br /&gt;
&lt;br /&gt;
[[User:Snowman7 | Snowman7]] - 日语&lt;br /&gt;
&lt;br /&gt;
[[User:JerC | JerC]] - 法语?(没有进行考证,也许是...)&lt;br /&gt;
&lt;br /&gt;
== 其它 ==&lt;br /&gt;
'''''注意:''''' 我们使用了他们的东西,并经过了他们的同意,但他们不属于'''黑曜石制作组'''.&lt;br /&gt;
&lt;br /&gt;
[[User:Romka | Romka]] - 模型制作 (戈登·弗里曼玩家模型)&lt;br /&gt;
&lt;br /&gt;
[[User:Power-Mad | Power-Mad]] - 地图制作 (oc_starlight)&lt;br /&gt;
&lt;br /&gt;
[[User:Hickadam | Hickadam]] - 地图制作 (oc_evildead,oc_cannon)&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - 地图制作 (oc_umizuri,oc_damanku,oc_kake,coop_zelda)&lt;br /&gt;
&lt;br /&gt;
[[User:Keychain | Keychain]] - 视频制作 (1.35 Teaser Trailer)&lt;br /&gt;
&lt;br /&gt;
[[User:Rob | Rob]] - 配音演员 (ep2_oc_broken_escape_02b/broken_escape_02c)&lt;br /&gt;
&lt;br /&gt;
== 特殊成员 ==&lt;br /&gt;
[[User:Skidz | Skidz]] - 模组领队,代码编写&lt;br /&gt;
&lt;br /&gt;
[[User:Hyperjag3 | Hyperjag3]] - 代码编写领队&lt;br /&gt;
&lt;br /&gt;
[[User:Barnz | Barnz]] - 模型制作&lt;br /&gt;
&lt;br /&gt;
[[User:DaMaN | DaMaN]] - 地图制作&lt;br /&gt;
&lt;br /&gt;
== 其它 ==&lt;br /&gt;
* 如果有人有过贡献,并且被制作组使用,但是却没有出现在这个列表里,请联系 [[User:Shana | Shana]] 或者 [[User:Neico | Neico]] 他们会帮助你.&lt;br /&gt;
* 如果你想讨论本帖,请去 [[{{TALKPAGENAME}} | Discussions Page]].&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=De_port&amp;diff=1657</id>
		<title>De port</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=De_port&amp;diff=1657"/>
				<updated>2018-01-21T09:38:14Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
{{oc_map}}&lt;br /&gt;
[[Image:De_port.jpg|thumb|right|256px]]&lt;br /&gt;
==Map Info==&lt;br /&gt;
{| cellspacing=&amp;quot;4&amp;quot; cellpadding=&amp;quot;1&amp;quot;&lt;br /&gt;
| '''Mapadd Name''' || de_port&lt;br /&gt;
|-&lt;br /&gt;
| '''Author''' || [[User:Shana|Shana]]&lt;br /&gt;
|-&lt;br /&gt;
| '''Genre''' || Linear/Combat&lt;br /&gt;
|-&lt;br /&gt;
| '''Suggested Players''' || 2-16&lt;br /&gt;
|-&lt;br /&gt;
| '''Starting Weapons:''' || weapon_crowbar &amp;lt;br /&amp;gt; weapon_healer &amp;lt;br /&amp;gt; weapon_smg1 &amp;lt;br /&amp;gt; weapon_uzi&lt;br /&gt;
|-&lt;br /&gt;
| '''Requirement Gaems:''' || Half-Life 2 &amp;lt;br /&amp;gt; Counter-Strike: Source&lt;br /&gt;
|-&lt;br /&gt;
|}&lt;br /&gt;
== Gameplay ==&lt;br /&gt;
Your mission is to get to the ship and secure it to escape from the combine.&lt;br /&gt;
&lt;br /&gt;
==Weapons==&lt;br /&gt;
* weapon_crowbar&lt;br /&gt;
* weapon_healer&lt;br /&gt;
* weapon_smg1&lt;br /&gt;
* weapon_uzi&lt;br /&gt;
* weapon_frag&lt;br /&gt;
* weapon_ar2&lt;br /&gt;
* weapon_shotgun&lt;br /&gt;
* weapon_rpg&lt;br /&gt;
* item_rpg_round&lt;br /&gt;
* weapon_357&lt;br /&gt;
&lt;br /&gt;
==NPCs==&lt;br /&gt;
* npc_combine_s &amp;lt;soldier, shotgunner, and elite&amp;gt;&lt;br /&gt;
* npc_sniper&lt;br /&gt;
* npc_turret_floor&lt;br /&gt;
* npc_metropolice&lt;br /&gt;
* npc_manhack&lt;br /&gt;
* monster_human_assassin&lt;br /&gt;
* npc_combinegunship&lt;br /&gt;
* npc_helicopter&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Oc_broken_escape&amp;diff=1656</id>
		<title>Oc broken escape</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Oc_broken_escape&amp;diff=1656"/>
				<updated>2018-01-21T09:37:55Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{oc_map}}&lt;br /&gt;
[[Image:Oc_broken_escape.jpg|thumb|right|256px]]&lt;br /&gt;
==Map Info==&lt;br /&gt;
{| cellspacing=&amp;quot;4&amp;quot; cellpadding=&amp;quot;1&amp;quot;&lt;br /&gt;
| '''Map Name''' || ep1_oc_broken_escape_01, ep2_oc_broken_escape_02a, ep2_oc_broken_escape_02b, ep2_oc_broken_escape_02c&lt;br /&gt;
|-&lt;br /&gt;
| '''Author''' || [[User:Shana|Shana]]&lt;br /&gt;
|-&lt;br /&gt;
| '''Genre''' || Linear/Combat/Puzzle&lt;br /&gt;
|-&lt;br /&gt;
| '''Suggested Players''' || 2-8&lt;br /&gt;
|-&lt;br /&gt;
|}&lt;br /&gt;
&lt;br /&gt;
== Gameplay ==&lt;br /&gt;
This long campaign starts off with the players having to escape city 17 on foot after their escape train had to stop.&lt;br /&gt;
&lt;br /&gt;
As the map progresses, players will come across a huge combine underground base they have to discover.&lt;br /&gt;
&lt;br /&gt;
This campaign is very fast-paced and follows classic co-op gameplay, which means endless player respawns and supplies. It is still required to cooperate with other players and keep them alive to not lose a tactical position or map progress.&lt;br /&gt;
&lt;br /&gt;
Cooperation is also often required to progress in the map, like solving 2-player puzzles.&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Oc_castledefense&amp;diff=1655</id>
		<title>Oc castledefense</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Oc_castledefense&amp;diff=1655"/>
				<updated>2018-01-21T09:37:21Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
{{oc_map}}&lt;br /&gt;
[[Image:Oc_castledefense.jpg|thumb|right|256px]]&lt;br /&gt;
==Map Info==&lt;br /&gt;
{| cellspacing=&amp;quot;4&amp;quot; cellpadding=&amp;quot;1&amp;quot;&lt;br /&gt;
| '''Map Name''' || oc_castledefense&lt;br /&gt;
|-&lt;br /&gt;
| '''Author''' || [[User:Shana|Shana]]&lt;br /&gt;
|-&lt;br /&gt;
| '''Genre''' || Combat&lt;br /&gt;
|-&lt;br /&gt;
| '''Suggested Players''' || 2-16&lt;br /&gt;
|-&lt;br /&gt;
|}&lt;br /&gt;
&lt;br /&gt;
== Gameplay ==&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Maps&amp;diff=1654</id>
		<title>Maps</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Maps&amp;diff=1654"/>
				<updated>2018-01-21T09:36:50Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
&lt;br /&gt;
__TOC__&lt;br /&gt;
&lt;br /&gt;
For a automated Listing click [[:Category:Oc_maps|here]]&lt;br /&gt;
== Official Maps ==&lt;br /&gt;
The following maps are officially included with the installer of Obsidian Conflict.&lt;br /&gt;
&lt;br /&gt;
=== Development Team ===&lt;br /&gt;
&lt;br /&gt;
* [[Oc_antlion_attack|oc_antlion_attack]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_breakout|oc_breakout]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[oc_broken_escape|oc_broken_escape series]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[Oc_cardwar|oc_cardwar]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_castledefense|oc_castledefense]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[Oc_courier|oc_courier]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_fireteam|oc_fireteam series]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_freezingpoint|oc_freezingpoint]] by [[User:skidz|skidz]]&lt;br /&gt;
* [[Oc_harvest|oc_harvest]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_lobby|oc_lobby]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_manor|oc_manor]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_return_c17|oc_return_c17 series]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_seamus|oc_seamus]] by [[User:skidz|skidz]]&lt;br /&gt;
* [[Oc_starship_troopers|oc_starship_troopers]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_stitches|oc_stitches series]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Oc_waking_dead|oc_waking_dead]] by [[User:DaMaN|DaMaN]]&lt;br /&gt;
* [[Oc_wildfire|oc_wildfire]] by [[User:Tysn|Tysn]]&lt;br /&gt;
* [[Ocf_deadland|ocf_deadland]] by [[User:skidz|skidz]]&lt;br /&gt;
&lt;br /&gt;
=== Community ===&lt;br /&gt;
&lt;br /&gt;
* [[Oc_Bunker|oc_Bunker]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_cannon|oc_cannon series]] by [[User:Hickadam|Hickadam]]&lt;br /&gt;
* [[Oc_danmaku|oc_danmaku]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_docks|oc_docks]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_evildead|oc_evildead]] by [[User:Hickadam|Hickadam]]&lt;br /&gt;
* [[Oc_kake|oc_kake]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_newgappi|oc_newgappi]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_sewers|oc_sewers]] by [[User:JoeScoma|JoeScoma]]&lt;br /&gt;
* [[Oc_starlight|oc_starlight]] by [[User:Powermad|Powermad]]&lt;br /&gt;
* [[Oc_umizuri|oc_umizuri]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Oc_wgh|oc_wgh]] by [[User:Fox|Fox]]&lt;br /&gt;
* [[Oc_zelda|oc_zelda series]] by [[User:Zteer|Zteer]]&lt;br /&gt;
* [[Z_harrier2_f|z_harrier2_f]] by [[User:Zteer|Zteer]]&lt;br /&gt;
&lt;br /&gt;
=== In Development ===&lt;br /&gt;
* [[Oc_cadaverous|oc_cadaverous]] by [[User:Tysn|Tysn]]&lt;br /&gt;
&lt;br /&gt;
== Community Maps ==&lt;br /&gt;
The following maps were created for Obsidian Conflict by members of the community.&lt;br /&gt;
&lt;br /&gt;
=== Released ===&lt;br /&gt;
* [[Oc_junkfall|oc_junkfall]] by [[User:Saccn|Saccn]]&lt;br /&gt;
* [[Oc_diving|oc_diving]] by [[User:Beanbrains|Beanbrains]]&lt;br /&gt;
* [[Oc_paysan|oc_paysan]] by [[User:Sven|Sven]]&lt;br /&gt;
* [[Cs_siege_pcs_oc|CS_Siege_pcs_OC]] by [[User:Maestro_Fenix|Maestro Fénix]]&lt;br /&gt;
&lt;br /&gt;
=== Unreleased ===&lt;br /&gt;
 &lt;br /&gt;
* [[Oc_holdthefort|oc_holdthefort]] by [[User:Shiftey|Shiftey]]&lt;br /&gt;
* [[Oc_Oasis|oc_oasis]] by [[User:Gjsdeath|Gjsdeath]]&lt;br /&gt;
* [[Oc_Zombie_Survival|oc_zombie_survival]] by [[User:Gjsdeath|Gjsdeath]]&lt;br /&gt;
* [[Oc Nacht der Untoten|Oc_nacht_der_untoten]] by [[User:HeadCrabD|HeadCrabD]]/[[User:Maestro_Fenix|Maestro Fénix]]&lt;br /&gt;
&lt;br /&gt;
=== Mapadds ===&lt;br /&gt;
&lt;br /&gt;
* [[cs_militia|cs_militia]] by [[User:Gandorques Hikla|Gandorques Hikla]]&lt;br /&gt;
* [[de_chateau|de_chateau]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_dust|de_dust]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_nuke|de_nuke]] by [[User:fug4life|fug4life]]&lt;br /&gt;
* [[de_port|de_port]] by [[User:Shana|Shana]]&lt;br /&gt;
* [[de_prodigy|de_prodigy]] by [[User:fug4life|fug4life]]&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	<entry>
		<id>https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team&amp;diff=1653</id>
		<title>Obsidian Conflict Team</title>
		<link rel="alternate" type="text/html" href="https://wiki.obsidianconflict.net/?title=Obsidian_Conflict_Team&amp;diff=1653"/>
				<updated>2018-01-21T09:35:30Z</updated>
		
		<summary type="html">&lt;p&gt;Shana: &lt;/p&gt;
&lt;hr /&gt;
&lt;div&gt;{{Languages}}&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
== Head ==&lt;br /&gt;
[[User:Shana | Shana]] - Mod Leader&lt;br /&gt;
&lt;br /&gt;
== Coder ==&lt;br /&gt;
[[User:Neico | Neico]] - Lead Coder&lt;br /&gt;
&lt;br /&gt;
[[User:TESLA-X4 | TESLA-X4]] - Coder&lt;br /&gt;
&lt;br /&gt;
[[User:Z33ky | Z33ky]] - Coder&lt;br /&gt;
&lt;br /&gt;
[[User:Siosphere | Siosphere]] - Coder&lt;br /&gt;
&lt;br /&gt;
== Mapper ==&lt;br /&gt;
[[User:Tysn | Tysn]] - Lead Mapper&lt;br /&gt;
&lt;br /&gt;
[[User:Shana | Shana]] - Mapper&lt;br /&gt;
&lt;br /&gt;
[[User:Xenire | Xenire]] - Mapper&lt;br /&gt;
&lt;br /&gt;
== Modelers ==&lt;br /&gt;
[[User:Nirrti | Nirrti]] - Modeler&lt;br /&gt;
&lt;br /&gt;
[[User:Shana | Shana]] - Modeler&lt;br /&gt;
&lt;br /&gt;
== Animators ==&lt;br /&gt;
[[User:Linkmister | Linkmister]] - Animator&lt;br /&gt;
&lt;br /&gt;
[[User:siNister | siNister]] - Animator&lt;br /&gt;
&lt;br /&gt;
== 2D Artists ==&lt;br /&gt;
[[User:Lt_Commander | Lt_Commander]] - 2D Artist&lt;br /&gt;
&lt;br /&gt;
== Translators ==&lt;br /&gt;
'''''Note:''''' These people aren't really apart of the [[Obsidian Conflict Team]] but deserve credit as well.&lt;br /&gt;
If you wish to translate a language you speak well that isn't on this list, feel free to contact [[User:Neico | Neico]].&lt;br /&gt;
&lt;br /&gt;
'''''English and German are already handled by members of the team.'''''&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - Japanese&lt;br /&gt;
&lt;br /&gt;
[[User:Snowman7 | Snowman7]] - Japanese&lt;br /&gt;
&lt;br /&gt;
[[User:JerC | JerC]] - French? (isn't set yet, but might be...)&lt;br /&gt;
&lt;br /&gt;
== Content Contributers ==&lt;br /&gt;
'''''Note:''''' People that have given content and effort into the mod but aren't part of the [[Obsidian Conflict Team]].&lt;br /&gt;
&lt;br /&gt;
[[User:Romka | Romka]] - Modeler ( Various models including H.E.C.U. Grunts, Assassin, Gordon and Spas-12.)&lt;br /&gt;
&lt;br /&gt;
[[User:Power-Mad | Power-Mad]] - Mapper ( oc_starlight )&lt;br /&gt;
&lt;br /&gt;
[[User:Hickadam | Hickadam]] - Mapper ( oc_evildead, oc_cannon )&lt;br /&gt;
&lt;br /&gt;
[[User:Zteer | Zteer]] - Mapper ( oc_umizuri, oc_damanku, oc_kake, coop_zelda)&lt;br /&gt;
&lt;br /&gt;
[[User:Rob | Rob]] - Voiceactor (ep2_oc_broken_escape_02b/broken_escape_02c)&lt;br /&gt;
&lt;br /&gt;
== Ex Members ==&lt;br /&gt;
[[User:Skidz | Skidz]] - Mod Leader &amp;amp; Coder&lt;br /&gt;
&lt;br /&gt;
[[User:Hyperjag3 | Hyperjag3]] - Lead Coder&lt;br /&gt;
&lt;br /&gt;
[[User:Barnz | Barnz]] - Modeler&lt;br /&gt;
&lt;br /&gt;
[[User:DaMaN | DaMaN]] - Mapper&lt;br /&gt;
&lt;br /&gt;
[[User:Vesuvian | Vesuvian]] - Mapper&lt;br /&gt;
&lt;br /&gt;
[[User:MushrooMars | MushrooMars]] - Modeler&lt;br /&gt;
&lt;br /&gt;
== Additional Notes ==&lt;br /&gt;
* If someone seems to be missing from this list, feel free to ask [[User:Shana| Shana]] or [[User:Neico | Neico]] to have them add you.&lt;br /&gt;
* If you want to talk about this page, it's design etc. feel free to use the [[{{TALKPAGENAME}} | Discussions Page]]&lt;/div&gt;</summary>
		<author><name>Shana</name></author>	</entry>

	</feed>