Guerilla Bandits and Insurgents Oh My!: Adhomai's Cold War comes in Hot!

citadel.dme

@@ -1150,6 +1150,10 @@
 #include "code\game\content\factions\orion\iwl\head.dm"
 #include "code\game\content\factions\orion\iwl\suits.dm"
 #include "code\game\content\factions\orion\iwl\uniform.dm"
+#include "code\game\content\factions\tajara\_generic\guns.dm"
+#include "code\game\content\factions\tajara\dra\guns.dm"
+#include "code\game\content\factions\tajara\nka\guns.dm"
+#include "code\game\content\factions\tajara\pra\guns.dm"
 #include "code\game\content\locations\frontier.dm"
 #include "code\game\dna\dna2.dm"
 #include "code\game\dna\dna2_domutcheck.dm"
@@ -3146,13 +3150,13 @@
 #include "code\modules\jobs\job_types\station\admin\centcom_officer.dm"
 #include "code\modules\jobs\job_types\station\admin\emergency_responder.dm"
 #include "code\modules\jobs\job_types\station\civillian\assistant.dm"
-#include "code\modules\jobs\job_types\station\civillian\outsider.dm"
 #include "code\modules\jobs\job_types\station\civillian\chaplain.dm"
 #include "code\modules\jobs\job_types\station\civillian\clown.dm"
 #include "code\modules\jobs\job_types\station\civillian\entertainer.dm"
 #include "code\modules\jobs\job_types\station\civillian\internals_affairs_agent.dm"
 #include "code\modules\jobs\job_types\station\civillian\librarian.dm"
 #include "code\modules\jobs\job_types\station\civillian\mime.dm"
+#include "code\modules\jobs\job_types\station\civillian\outsider.dm"
 #include "code\modules\jobs\job_types\station\civillian\pilot.dm"
 #include "code\modules\jobs\job_types\station\command\blueshield.dm"
 #include "code\modules\jobs\job_types\station\command\captain.dm"
@@ -4040,6 +4044,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\possessed.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\taj_guerilla.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\lavaland\goliath.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\lavaland\gutshank.dm"

code/__DEFINES/mobs/iff.dm

@@ -107,3 +107,14 @@
 
 #define MOB_IFF_FACTION_CLOCKWORK_CULT "clock-cult"
 #define MOB_IFF_FACTION_SANGUINE_CULT "blood-cult"
+
+//? Tajara Factions ?//
+
+#define MOB_IFF_FACTION_TAJARA_NKA "tajara-nka_brigands-"
+#define MOB_IFF_FACTION_TAJARA_NKA_GROUP(GROUP) ("tajara-nka_brigands-" + GROUP)
+
+#define MOB_IFF_FACTION_TAJARA_DRA "tajara-dra_guerillas-"
+#define MOB_IFF_FACTION_TAJARA_DRA_GROUP(GROUP) ("tajara-dra_guerillas-" + GROUP)
+
+#define MOB_IFF_FACTION_TAJARA_PRA "tajara-pra_insurgents"
+#define MOB_IFF_FACTION_TAJARA_PRA_GROUP(GROUP) ("tajara-pra_insurgents-" + GROUP)

code/game/content/factions/tajara/_generic/guns.dm

@@ -0,0 +1,46 @@
+//////////////////////////////////////////
+// Generic Tajara Weapons
+///////////////////////////////////////////
+/* Notes on Tajara Firearms:
+The Tajara history is more or less that a fuedal society with early 19th century technology was contacted by aliens with all their new dangerous ideas and cased \
+munition firearm technology (way better then mnuskets). The resulting civil war was extremely devastating and no one won, as a result Tajara weapons technology is
+extremely varied ranging from 19th century crude to modern and post modern automatics. */
+
+
+/obj/item/gun/ballistic/contender/taj
+	name = "Adhomai pocket rifle"
+	desc = "A simple Adhomai Hand Cannon. Its simple design dates back to the civil war where hand cannons like it were rushed into service to counter the massive arms shortage \
+	the many factions faced at the start of the war. Since then various local manufacturers have refined the design into a mainstay backup weapon of solider and civilian alike."
+	icon = 'icons/content/factions/tajara/items/guns/taj_pockrifle.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_pockrifle.dmi'
+
+/obj/item/gun/ballistic/contender/taj/a44
+	caliber = /datum/ammo_caliber/a44
+	ammo_type = /obj/item/ammo_casing/a44
+
+/obj/item/gun/ballistic/contender/taj/a762
+	caliber = /datum/ammo_caliber/a7_62mm
+	ammo_type = /obj/item/ammo_casing/a7_62mm
+
+
+/obj/item/gun/ballistic/shotgun/pump/rifle/taj/sawn
+	name = "Adhomai obrez"
+	desc = "The civil war on Adhomai saw countless gun manufacturers pumping out cheap bolt action rifles. During the general chaos of the civil \
+	war many of these rifles were sawn down by revolutionaries and bandits who couldn't get their hands on proper pistols. Even as technology \
+	on Adhomai has moved past bolt actions these guns remain plentiful among the criminal underworld and other nefarious groups."
+	icon_state = "sawnrifle"
+	item_state = "sawnrifle"
+	recoil = 2
+	accuracy = -15
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
+
+/obj/item/gun/ballistic/musket/taj
+	name = "Adhomian musket"
+	desc = "For the Tajara, the era of black powder warfare was not all that long ago. As result many genuine Adhomian muskets both reproduction and \
+	even genuine, are often seen in the hands of Tajaran civilians and weapons collectors. They are especially prominent in many Tajaran states where \
+	strict firearms laws prevent the ownership of modern weapons."
+	icon = 'icons/content/factions/tajara/items/guns/taj_musket.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_musket.dmi'
+	icon_state = "musket"
+	item_state = "musket"

code/game/content/factions/tajara/dra/guns.dm

@@ -0,0 +1,47 @@
+//////////////////////////////////////////
+// Democratic Republic of Adhomai (DRA) Firearms
+///////////////////////////////////////////
+/* Notes on DRA Firearms:
+The Democratic Republic of Adhomai was formed from a coalition of revolutionary guerilla movements who successfully liberated
+their cities from People's Republic of Adhomai rule during the civil war. Since then military juntas have slowly been giving
+way to liberal democracy however the military remains extremely influential and a balance must remain maintained less there
+be a coup de'tat. Aesthetically they share a lot with the 20th century latin America guerillas such as Che Guevara and
+ */
+
+///////////////////
+//One Handed
+///////////////////
+
+/obj/item/gun/ballistic/automatic/mini_uzi/taj
+	name = "\improper Adhomai Uzi"
+	desc = "The Hotak's Arms machine pistol has developed a fierce reputation for its use by guerillas of the Democratic Republic of Adhomai. \
+	Its top loading magazine allows one to go completely prone in the deep snow banks of Adhomai while maintaining good weapon stability."
+	icon = 'icons/content/factions/tajara/items/guns/taj_uzi.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_uzi.dmi'
+	icon_state = "mini-uzi"
+	item_state = "mini-uzi"
+
+///////////////////
+//Two Handed
+///////////////////
+
+/obj/item/gun/ballistic/SVD/taj
+	name = "Adhomai sniper rifle"
+	desc = "The Hotaki Marksman rifle, in stark contrast to the usual products of Hotak's arms, is an elegant and precise rifle that has taken the lives of \
+	many high value targets in the name of defending the Democratic Republic of Adhomai."
+	icon = 'icons/content/factions/tajara/items/guns/taj_svd.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_svd.dmi'
+
+/obj/item/gun/ballistic/SVD/taj/scope()
+	toggle_scope(2.0)
+
+/obj/item/gun/ballistic/automatic/fal/taj
+	name = "Adhomai battle rifle"
+	desc = "When faced with creating a modern battle rifle for the Democratic Republic of Adhomai, Hotak's Arms simply scaled up their machine pistol design \
+	to a rifle capable of chamber 7.62mm a round already in use by DRA marksmen. The new rifle proved itself a match for its peers and DRA propaganda recieved \
+	a noticeable boost showing off its Adhomai original design."
+	icon = 'icons/content/factions/tajara/items/guns/taj_fal.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_fal.dmi'
+	icon_state = "fal"
+	item_state = "fal"
+

code/game/content/factions/tajara/nka/guns.dm

@@ -0,0 +1,79 @@
+//////////////////////////////////////////
+// New Kingdom of Adhomai (NKA) Firearms
+///////////////////////////////////////////
+/* Notes on NKA Firearms:
+The New Kingdom of Adhomai (NKA) is both a backward reactionary monarchy and a space faring nation. Their technology \
+is a strange mix of both laughably dated and suprisingly advanced. The political situation in the NKA was until recent \
+unfavorable to technological development, as such the NKA has a bevy of extremely dated weapons that are noticably \
+behind their counterparts on Adhomai. A newly empowered faction within the Royal Court led by the crown prince \
+believes that the NKA can modernize into a technofuedal state and are vigorously pursuing modernization with a \
+traditional twist. As a result the advanced tech of the NKA serve to reinforce traditional values and feudalism. \
+Their weapon design reflects this as even advanced weapons have traditional elements. Ideally advanced weapons of \
+the NKA use some handcrafted parts at the very least. Many also have aesthetics reminescent of a fuedal ideal \
+as their noble knights can't be knightly unless their weapons are ornate enough. */
+
+///////////////////
+//One Handed
+///////////////////
+
+/obj/item/gun/ballistic/revolver/mateba/taj
+	name = "Adhomai revolver"
+	desc = "The Akhan and Khan Royal Service Revolver. Sophisticated but dated, this weapon is a metaphor for the New Kingdom of Adhomai itself."
+	icon = 'icons/content/factions/tajara/items/guns/taj_revolver.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_revolver.dmi'
+	icon_state = "revolver"
+	item_state = "revolver"
+
+/obj/item/gun/ballistic/revolver/mateba/taj/knife
+	name = "Adhomai knife revolver"
+	desc = "An ornate knife revolver from an Adhomai gunsmith. Popular among Tajaran nobility just before the civil war, many of these revolvers \
+	found their way into the market when they were taken as trophies by Grand People's Army soldiers and DPRA guerillas."
+	icon_state = "knifegun"
+	item_state = "knifegun"
+	caliber = /datum/ammo_caliber/a38
+	ammo_type = /obj/item/ammo_casing/a38
+	max_shells = 9 //Large Cyl
+	damage_force = 15
+	damage_mode = DAMAGE_MODE_SHARP | DAMAGE_MODE_EDGE
+
+///////////////////
+//Two Handed
+///////////////////
+
+/obj/item/gun/ballistic/shotgun/pump/rifle/taj
+	name = "Adhomai bolt action rifle"
+	desc = "The Arkhan & Khan carbine (or just A&K-c) bolt action rifle was adopted by the New Kingdom just after the outbreak of the Adhomai civil war. \
+	After many decades of service it is finally been retired as the New Kingdom embraces modern firearms."
+	icon = 'icons/content/factions/tajara/items/guns/taj_boltaction.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_boltaction.dmi'
+	icon_state = "boltaction"
+	item_state = "boltaction"
+
+/obj/item/gun/ballistic/automatic/sts35/taj
+	name = "Adhomai assault rifle"
+	desc = "The Arkhan & Khan 'Halbred' battle rifle uses wooden furniture and brass banding to diguise the fact that it's internals are a knock-off of Hephaestus \
+	Industries' STS-35. The New Kingdom of Adhomai only recently adopted this rifle which it is already rolling out in massive numbers. A feat some say is \
+	beyond the Industrial capabilities of the New Kingdom leading many to speculate that some of the rifles are foriegn supplied."
+	icon = 'icons/content/factions/tajara/items/guns/taj_arifle.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_arifle.dmi'
+	icon_state = "arifle"
+	item_state = "arifle"
+
+	firemodes = list(
+		list(mode_name="semiauto",       burst=1, fire_delay=0,    move_delay=null, burst_accuracy=null, dispersion=null),
+		list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6,    burst_accuracy=list(60,45,40), dispersion=list(0.0, 0.8, 0.8))
+		)
+
+///////////////////
+//Energy
+///////////////////
+/obj/item/gun/energy/retro/taj
+	name = "Adhomai dueling laser"
+	desc = "The New Kingdom of Adhomai's was resistant to the adoption of energy weapons until an enterprising Tajara technician presented the crown prince with a ornate \
+	laser pistol built in the style of old flintlock dueling pistols. As planned laser mania instantly took over NKA high society and laser pistols such as these became \
+	a must have item for even the most traditional noble. Increasingly these pistols are finding their way to the frontier as their style is increasingly appreciated outside \
+	of Adhomai."
+	icon = 'icons/content/factions/tajara/items/guns/taj_duelinglaser.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_duelinglaser.dmi'
+	icon_state = "retro"
+	item_state = "retro"

code/game/content/factions/tajara/pra/guns.dm

@@ -0,0 +1,52 @@
+//////////////////////////////////////////
+// People's Republic of Adhomai (PRA) Firearms
+///////////////////////////////////////////
+/* Notes on PRA Firearms:
+The People's Republic of Adhomai (PRA) is a authoritarian socialist regime reminiscent of the Stalin era Soviet Union.
+The creation of the PRA was a result of the rapid social changes on Adhomai brought about by contact with aliens namely humans.
+Despite the successes of the counter revolutions they are still the largest and most advanced Tajara nation. Though they are
+signifcantly behind human nations when it comes to energy weapons they aren't far behind in terms of ballistics.
+They also share idealogical and economic connections to the Interplanetary Worker's League one of the most powerful
+members of the Orion Confederation, who have greatly influenced their weaposn development. PRA weapons therefore
+are heavily influenced by Soviet futurism and other depictions of future soviet/socialist states.*/
+
+///////////////////
+//One Handed
+///////////////////
+
+/obj/item/gun/ballistic/colt/taj
+	name = "Adhomai Pistol"
+	desc = "The Adar'Mazy pistol, produced by the Hadii-Wrack group. This pistol is the primary sidearm for low ranking officers and \
+	officals in the People's Republic of Adhomai."
+	icon = 'icons/content/factions/tajara/items/guns/taj_colt.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_colt.dmi'
+	icon_state = "gun"
+
+
+/obj/item/gun/ballistic/deagle/taj
+	name = "Adhomai Hand Cannon"
+	desc = "The Nal'dor heavy pistol, a powerful Hadii-Wrack group handcannon that has gained an infamous reputation through its use by \
+	Commissars of the People's Republic of Adhomai."
+	icon = 'icons/content/factions/tajara/items/guns/taj_deagle.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_deagle.dmi'
+
+///////////////////
+//Two Handed
+///////////////////
+
+/obj/item/gun/ballistic/automatic/automat/taj
+	name = "Adhomai automat"
+	desc = "The Hadii-Wrack Avtomat, is an aging internal magazine automatic rifle of the People's Republic of Adhomai's Grand People's Army \
+	whose long and storied service life is coming to an end as it is phased out in favor of more modern automatics."
+	icon = 'icons/content/factions/tajara/items/guns/taj_automat.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_automat.dmi'
+	fire_anim = ""
+
+/obj/item/gun/ballistic/automatic/k25/taj
+	name = "Tajara Service Rifle"
+	desc = "The Hadii-Wrack Type 19 Avtomat, a licensed copy of the Interplanetary Worker's League K25 service rifle and new standard battle rifle \
+	of the People's Republic of Adhomai. The firearm has become a symbol of the growing collaboration between the Worker's League and People's Republic \
+	a cooperation that unsettles many with their nominal superiors in the Orion Confederation and Confederate Commonwealth."
+	icon = 'icons/content/factions/tajara/items/guns/taj_k25.dmi'
+	inhand_icon = 'icons/content/factions/tajara/items/guns/taj_k25.dmi'
+

code/modules/ai/holders/polaris/say_list.dm

@@ -194,3 +194,39 @@
 	say_threaten = list("Help me!", "Please help!", "Hey, who turned out the lights?", "Allonsy!", "Geronimo!")
 	say_stand_down = list("Please. Anyone. Help!", "Where is everyone?", "Where am I?")
 	say_escalate = list("Help!", "I'm sorry!", "I can't stop!", "I don't want to do this!", "I don't want to go!")
+
+// Generic Lines for all Tajara mobs
+/datum/say_list/tajara
+	speak = list("So hot herrre...",
+				"Could use a nice cigarrr...",
+				"Still betterrr then the factorrries...",
+				"They didn't say it would be this borrring.",
+				"Been forreverrr since I have some good gin")
+	emote_see = list("sniffs.", "coughs.", "mrrrps.", "looks around.", "chokes on a hairball.", "flicks their tail.")
+	say_maybe_target = list("Who's therrre?")
+	threaten_sound = 'sound/weapons/TargetOn.ogg'
+	stand_down_sound = 'sound/weapons/TargetOff.ogg'
+
+/datum/say_list/tajara/nka
+	say_understood = list("Yes sirrr my liege!", "At once sirrre!")
+	say_cannot = list("I cannot my lorrrd!")
+	say_got_target = list("Messa will take you!")
+	say_threaten = list("Cease Trrrespasserrr!", "You trrread on prrrivate prrropurrty!")
+	say_stand_down = list("S'rrrendarrr good.")
+	say_escalate = list("You'll make a fine rrrug!", "For Adhomai!")
+
+/datum/say_list/tajara/pra
+	say_understood = list("Aye Comrrrade!", "Togetherrr!")
+	say_cannot = list("I cannot sirrr!")
+	say_got_target = list("We will be liberrated!")
+	say_threaten = list("You some corrporrrate pig?!", "This land belong to the people!")
+	say_stand_down = list("Grreat.")
+	say_escalate = list("Die corrporrate dog!", "For Adhomai!")
+
+/datum/say_list/tajara/dra
+	say_understood = list("Yeah got it...", "Affirrrmative!")
+	say_cannot = list("Harrr Harrr No!")
+	say_got_target = list("Welcome to the snowfields!")
+	say_threaten = list("You think you can stop us?!", "This is a frree terrrritorry! Scrram!")
+	say_stand_down = list("Grrreat now we gotta move camp.")
+	say_escalate = list("You'll neverrr stop us all!", "For Adhomai!")

code/modules/awaymissions/corpse.dm

@@ -605,6 +605,37 @@
 	corpsehelmet = /obj/item/clothing/head/pirate
 */
 
+//////////////////////////
+//		Tajara Bodies
+//////////////////////////
+
+/obj/spawner/corpse/tajara
+	species = /datum/species/tajaran
+
+/obj/spawner/corpse/tajara/nka_soldier
+	name = "Tajara Brigand"
+	corpseuniform = /obj/item/clothing/under/tajaran/nka_uniform
+	corpsesuit = /obj/item/clothing/suit/armor/tajaran/cuirass
+	corpseshoes = /obj/item/clothing/shoes/tajara/armored
+	corpsegloves = /obj/item/clothing/gloves/tajaran_gauntlets
+	corpsehelmet = /obj/item/clothing/head/helmet/tajaran/kettle
+
+/obj/spawner/corpse/tajara/pra_soldier
+	name = "Tajara Insurgent"
+	corpseuniform = /obj/item/clothing/under/tajaran/dpra
+	corpsesuit = /obj/item/clothing/suit/armor/bulletproof
+	corpseshoes = /obj/item/clothing/shoes/tajara/workboots/dark
+	corpsegloves = /obj/item/clothing/gloves/black/tajara/smithgloves
+	corpsemask = /obj/item/clothing/mask/bandana/red
+	corpsehelmet = /obj/item/clothing/head/beret/tajaran/pvsm
+
+/obj/spawner/corpse/tajara/dra_soldier
+	name = "Tajara Guerilla"
+	corpseuniform = /obj/item/clothing/under/tajaran/pra_uniform
+	corpsesuit = /obj/item/clothing/suit/storage/vest/heavy/merc
+	corpseshoes = /obj/item/clothing/shoes/boots/swat
+	corpsegloves = /obj/item/clothing/gloves/combat
+	corpsehelmet = /obj/item/clothing/head/beret/tajaran
 
 //////////////////////////
 //		Other Bodies