Bad Moon on the Rise: A Farewell to Arms edition (#9715)

2026-07-18 19:39:42 +01:00 · 2020-08-22 06:22:56 -03:00
parent 2da2e50644
commit 59a3ed600b
28 changed files with 249 additions and 17 deletions
@@ -73,7 +73,7 @@

 /datum/accent/gibson
 	name = ACCENT_GIBSON
-	description = "The New Gibsoner accent is very close to the accent of Tau Ceti proper, due to the nature of the planet’s colonization. However, New Gibsoners are known for talking \
+	description = "The New Gibsoner accent is very close to the accent of Tau Ceti proper, due to the nature of the planet's colonization. However, New Gibsoners are known for talking \
 	with a faster and more clipped accent than those from Biesel and, at times, sound as if they are tripping over their words due to the rapid pace at which they speak."
 	tag_icon = "gibson"

@@ -59,7 +59,7 @@
 	icon_state = "praberet"
 	item_state = "praberet"

-/obj/item/clothing/head/tajaran/pra_beret
+/obj/item/clothing/head/tajaran/nka_cap
 	name = "service cap"
 	desc = "A simple service cap worn by soldiers of the Adhomai Imperial Army."
 	icon_state = "nkahat"
@@ -162,8 +162,8 @@
 /obj/item/clothing/suit/storage/tajaran/pra_jacket
 	name = "republican service jacket"
 	desc = "An olive military jacket worn by the forces of the Grand People's Army."
-	icon_state = "taj_commoncloak"
-	item_state = "taj_commoncloak"
+	icon_state = "greenservice"
+	item_state = "greenservice"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	armor = list(melee = 30, bullet = 20, laser = 20, energy = 10, bomb = 5, bio = 0, rad = 0)
 	siemens_coefficient = 0.50
@@ -223,3 +223,10 @@

 	drop_sound = 'sound/items/drop/paper.ogg'
 	pickup_sound = 'sound/items/pickup/paper.ogg'
+
+/obj/item/clothing/accessory/tajaran/srendarr
+	name = "holy sun rosette"
+	desc = "A simple rosette accessory depicting the Tajaran god S'rendarr."
+	icon_state = "rosette"
+	item_state = "rosette"
+	flippable = FALSE
@@ -41,7 +41,7 @@
 	uniform = /obj/item/clothing/under/tajaran/cosmonaut
 	shoes = /obj/item/clothing/shoes/jackboots/toeless
 	belt = /obj/item/storage/belt/military
-	back = /obj/item/gun/projectile/shotgun/pump/rifle
+	back = /obj/item/gun/projectile/automatic/rifle/adhomian
 	id = /obj/item/card/id/syndicate
 	accessory = /obj/item/clothing/accessory/badge/hadii_card
 	belt_contents = list(
@@ -0,0 +1,31 @@
+/mob/living/simple_animal/hostile/wind_devil
+	name = "sham'tyr"
+	desc = "A flying adhomian creature, known for their loud wails that can be heard far below the clouds they soar above."
+	icon_state = "devil"
+	icon_living = "devil"
+	icon_dead = "devil_dead"
+	icon_rest = "devil_rest"
+	turns_per_move = 3
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+	speed = -2
+	maxHealth = 80
+	health = 80
+	mob_size = 10
+
+	pass_flags = PASSTABLE
+
+	harm_intent_damage = 5
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "bitten"
+	attack_sound = 'sound/weapons/bite.ogg'
+
+	environment_smash = 1
+
+	faction = "sham'tyr"
+	flying = TRUE
+	butchering_products = list(/obj/item/stack/material/animalhide = 1)
+	meat_type = /obj/item/reagent_containers/food/snacks/meat/adhomai
+	meat_amount = 5
@@ -337,3 +337,10 @@
 	desc = "A miniaturized version of a nuclear bomb."
 	projectile_type = /obj/item/projectile/bullet/nuke
 	max_stack = 2
+
+/obj/item/ammo_casing/musket
+	name = "musket ball"
+	desc = "A solid ball made of lead."
+	icon_state = "musketball"
+	caliber = "musket"
+	projectile_type = /obj/item/projectile/bullet/pistol/strong
@@ -327,6 +327,42 @@
 		return
 	..()

+/obj/item/gun/projectile/automatic/rifle/adhomian
+	name = "adhomian automatic rifle"
+	desc = "The Tsarrayut'yan rifle is a select-fire, crew-served automatic rifle producted by the People's Republic of Adhomai."
+	icon = 'icons/obj/guns/tsarrayut.dmi'
+	icon_state = "tsarrayut"
+	item_state = "tsarrayut"
+	contained_sprite = TRUE
+
+	desc_fluff = "People's Republic military hardware is the most advanced among the Tajaran nations. Laser weapons, alongside simple ballistic guns, are used by high ranking soldiers or \
+	special operatives. The majority of military is still equipped with simple bolt action rifles, that are being slowly replaced by the Tsarrayut'yan rifle; a select-fire, crew-served \
+	automatic rifle. Regardless of advances in the small arms field, artillery is the Republican army's main weapon and pride."
+
+	load_method = SINGLE_CASING|SPEEDLOADER
+
+	ammo_type = /obj/item/ammo_casing/a762
+	allowed_magazines = null
+	magazine_type = null
+	max_shells = 25
+
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot/gunshot_rifle.ogg'
+
+	is_wieldable = TRUE
+
+	can_bayonet = TRUE
+	knife_x_offset = 23
+	knife_y_offset = 14
+
+/obj/item/gun/projectile/automatic/rifle/adhomian/update_icon()
+	..()
+	if(wielded)
+		item_state = "tsarrayut-wielded"
+	else
+		item_state = "tsarrayut"
+	update_held_icon()
+
 /obj/item/gun/projectile/automatic/tommygun
 	name = "vintage submachine gun"
 	desc = "A classic submachine gun. Uses .45 rounds."
@@ -0,0 +1,85 @@
+/obj/item/gun/projectile/musket
+	name = "adhomian musket"
+	desc = "A rustic firearm, used by Tajaran soldiers during the adhomian gunpowder age"
+
+	desc_fluff = "The Gunpowder Age was marked by the slow replacement of traditional Adhomian battle tactics and weapons, that included melee weapons and crossbows, in favor of \
+	cannons and primitive firing lines. The Kingdoms of Amohda, Nal'tor and Das'nrra were the first countries to make use of this new technology."
+
+	icon = 'icons/obj/guns/musket.dmi'
+	icon_state = "musket"
+	item_state = "musket"
+	contained_sprite = TRUE
+
+	load_method = SINGLE_CASING
+	handle_casings = DELETE_CASINGS
+
+	max_shells = 1
+
+	caliber = "musket"
+
+	slot_flags = SLOT_BACK
+
+	is_wieldable = TRUE
+
+	needspin = FALSE
+
+	w_class = ITEMSIZE_LARGE
+
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
+
+	fire_delay = 35
+	fire_sound = 'sound/weapons/gunshot/musket.ogg'
+	recoil = 4
+
+	ammo_type = /obj/item/ammo_casing/musket
+
+	var/has_powder = FALSE
+
+/obj/item/gun/projectile/musket/update_icon()
+	if(wielded)
+		item_state = "musket-wielded"
+	else
+		item_state = "musket"
+	update_held_icon()
+
+/obj/item/gun/projectile/musket/special_check(mob/user)
+	if(!has_powder)
+		to_chat(user, SPAN_WARNING("\The [src] is not loaded with gunpowder!"))
+		return FALSE
+
+	if(!wielded)
+		to_chat(user, SPAN_WARNING("You can't fire without stabilizing \the [src]!"))
+		return FALSE
+
+	var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
+	smoke.set_up(3, 0, user.loc)
+	smoke.start()
+	has_powder = FALSE
+	return ..()
+
+/obj/item/gun/projectile/musket/attackby(obj/item/W, mob/user)
+	..()
+	if (istype(W, /obj/item/reagent_containers))
+		if(has_powder)
+			to_chat(user, SPAN_WARNING("\The [src] is already full of gunpowder."))
+			return
+		var/obj/item/reagent_containers/C = W
+		if(C.reagents.has_reagent(/datum/reagent/gunpowder, 5))
+			if(do_after(user, 15))
+				if(has_powder)
+					return
+				C.reagents.remove_reagent(/datum/reagent/gunpowder, 5)
+				has_powder = TRUE
+				to_chat(user, SPAN_NOTICE("You fill \the [src] with gunpowder."))
+
+/obj/item/reagent_containers/powder_horn
+	name = "powder horn"
+	desc = "An ivory container for gunpowder."
+	icon = 'icons/obj/guns/musket.dmi'
+	icon_state = "powderhorn"
+	w_class = ITEMSIZE_NORMAL
+	slot_flags = SLOT_BELT
+	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = list(5)
+	volume = 30
+	reagents_to_add = list(/datum/reagent/gunpowder = 30)
@@ -260,3 +260,26 @@
 	desc_fluff = "A simple and reliable double action revolver, favored by the nobility, officers and law enforcement. The design is known for having an outdated reloading \
 	mechanism, with the need to manually eject each of the used cartridges, and reload one cartridge at a time through a loading gate. However, their cheap manufacturing cost has \
 	allowed countless copies to flood the Kingdom's markets."
+
+/obj/item/gun/projectile/revolver/knife
+	name = "knife-revolver"
+	desc = "An adhomian revolver with a blade attached to its barrel."
+	icon = 'icons/obj/guns/knifegun.dmi'
+	icon_state = "knifegun"
+	item_state = "knifegun"
+	max_shells = 6
+	caliber = "38"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	ammo_type = /obj/item/ammo_casing/c38
+	magazine_type = /obj/item/ammo_magazine/c38
+	force = 15
+	sharp = TRUE
+	edge = TRUE
+
+/obj/item/gun/projectile/revolver/knife/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+	if(default_parry_check(user, attacker, damage_source) && prob(20))
+		user.visible_message(SPAN_DANGER("\The [user] parries [attack_text] with \the [src]!"))
+		playsound(user.loc, "punchmiss", 50, 1)
+		return TRUE
+	return FALSE
@@ -137,7 +137,7 @@

 /datum/reagent/tricordrazine
 	name = "Tricordrazine"
-	description = "Tricordrazine is an old, though still useful, medication largely set aside following bicaridine and kelotane’s development. The drug increases the rate at which tissues regenerate, though far slower than modern medications."
+	description = "Tricordrazine is an old, though still useful, medication largely set aside following bicaridine and kelotane's development. The drug increases the rate at which tissues regenerate, though far slower than modern medications."
 	reagent_state = LIQUID
 	color = "#8040FF"
 	scannable = 1
@@ -607,7 +607,7 @@

 /datum/reagent/leporazine
 	name = "Leporazine"
-	description = "Leporazine is a complex medication which improves thermal homeostasis, stabilising and regulating the body’s core temperature. Leporazine often results in hyperventilation which should be monitored."
+	description = "Leporazine is a complex medication which improves thermal homeostasis, stabilising and regulating the body's core temperature. Leporazine often results in hyperventilation which should be monitored."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
 	overdose = REAGENTS_OVERDOSE
@@ -1075,7 +1075,7 @@

 /datum/reagent/cataleptinol
 	name = "Cataleptinol"
-	description = "Cataleptinol is a highly advanced, expensive medication capable of regenerating the most damaged of brain tissues. Cataleptinol is used in the treatment of dumbness, cerebral blindness, cerebral paralysis and aphasia. The drug is more effective when the patient’s core temperature is below 170K."
+	description = "Cataleptinol is a highly advanced, expensive medication capable of regenerating the most damaged of brain tissues. Cataleptinol is used in the treatment of dumbness, cerebral blindness, cerebral paralysis and aphasia. The drug is more effective when the patient's core temperature is below 170K."
 	reagent_state = LIQUID
 	color = "#FFFF00"
 	metabolism = REM * 2 //0.4
@@ -818,4 +818,12 @@
 		if(prob(15))
 			var/obj/item/organ/L = H.internal_organs_by_name[BP_LUNGS]
 			if(istype(L) && !L.robotic)
-				L.take_damage(0.5*removed)
+				L.take_damage(0.5*removed)
+
+/datum/reagent/gunpowder
+	name = "Gunpowder"
+	description = "A primitive explosive chemical."
+	reagent_state = SOLID
+	color = "#464650"
+	taste_description = "salt"
+	fallback_specific_heat = 1
@@ -479,7 +479,7 @@

 /datum/reagent/polysomnine
 	name = "Polysomnine"
-	description = "Polysomnine is a complex drug which rapidly induces sedation in preparation for surgery. Polysomnine’s sedative effect is fast acting, and sedated individuals wake up with zero amnesia regarding the events leading up to their sedation, however the only downside is how hard the drug is on the liver."
+	description = "Polysomnine is a complex drug which rapidly induces sedation in preparation for surgery. Polysomnine's sedative effect is fast acting, and sedated individuals wake up with zero amnesia regarding the events leading up to their sedation, however the only downside is how hard the drug is on the liver."
 	reagent_state = SOLID
 	color = "#000067"
 	metabolism = REM * 0.5
@@ -521,7 +521,7 @@

 /datum/reagent/slimetoxin
 	name = "Mutation Toxin"
-	description = "A transformative toxin isolated from jelly extract from green slimes. Use of the chemical has profound effects on the body’s cells, converting animal cells into unique slime cells. These slime cells begin to replace the normal cells of the body, resulting in the development of ‘slime people’, though eventually these degenerate into grey slimes."
+	description = "A transformative toxin isolated from jelly extract from green slimes. Use of the chemical has profound effects on the body's cells, converting animal cells into unique slime cells. These slime cells begin to replace the normal cells of the body, resulting in the development of ‘slime people', though eventually these degenerate into grey slimes."
 	reagent_state = LIQUID
 	color = "#13BC5E"
 	taste_description = "sludge"
@@ -701,7 +701,7 @@
 			to_chat(H,"<font size='3'><span class='cult'>You return back to life as the undead, all that is left is the hunger to consume the living and the will to spread the infection.</font></span>")


-			
+
 /datum/reagent/toxin/dextrotoxin
 	name = "Dextrotoxin"
 	description = "A complicated to make and highly illegal drug that cause paralysis mostly focused on the limbs."
@@ -720,7 +720,7 @@
 		to_chat(M, SPAN_WARNING("Your limbs start to feel numb and weak, and your legs wobble as it becomes hard to stand..."))
 		M.confused = max(M.confused, 250)
 	M.add_chemical_effect(CE_UNDEXTROUS, 1)
-	if(dose > 0.2)	
+	if(dose > 0.2)
 		M.Weaken(10)

 /datum/reagent/toxin/dextrotoxin/Destroy()
@@ -3563,3 +3563,10 @@
 	result = /datum/reagent/rmt
 	result_amount = 1
 	required_reagents = list(/datum/reagent/potassium = 1, /datum/reagent/inaprovaline = 1)
+
+/datum/chemical_reaction/gunpowder
+	name = "Gunpowder"
+	id = "gunpowder"
+	result = /datum/reagent/gunpowder
+	result_amount = 1
+	required_reagents = list(/datum/reagent/sulfur = 1, /datum/reagent/carbon = 1, /datum/reagent/potassium = 1)