mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-22 05:17:38 +01:00
Adds an unique gun to the pra consular officer (#6992)
What it says in the title. It also changes some items to be more lore friendly and have new description_fluff.
This commit is contained in:
@@ -33,6 +33,6 @@
|
||||
backpack_contents = list(
|
||||
/obj/item/weapon/storage/box/hadii_card = 1,
|
||||
/obj/item/weapon/storage/box/hadii_manifesto = 1,
|
||||
/obj/item/weapon/gun/projectile/pistol = 1
|
||||
/obj/item/weapon/gun/projectile/pistol/adhomai = 1
|
||||
)
|
||||
accessory = /obj/item/clothing/accessory/hadii_pin
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/pra
|
||||
name = "cosmonaut voidsuit helmet"
|
||||
name = "kosmostrelki voidsuit helmet"
|
||||
desc = "A tajaran helmet used by the crew of the Republican Orbital Fleet."
|
||||
icon_state = "cosmo_suit"
|
||||
item_state = "cosmo_suit"
|
||||
@@ -47,7 +47,7 @@
|
||||
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
|
||||
|
||||
/obj/item/clothing/suit/space/void/pra
|
||||
name = "cosmonaut voidsuit"
|
||||
name = "kosmostrelki voidsuit"
|
||||
desc = "A tajaran voidsuit used by the crew of the Republican Orbital Fleet."
|
||||
icon_state = "cosmo_suit"
|
||||
item_state = "cosmo_suit"
|
||||
|
||||
@@ -14,10 +14,12 @@
|
||||
fire_sound = 'sound/effects/Explosion1.ogg'
|
||||
recoil = 4
|
||||
|
||||
action_button_name = "Wield hand cannon"
|
||||
|
||||
is_wieldable = TRUE
|
||||
|
||||
description_fluff = "The adhomian hand cannon was created due the shortage of weapons that happened in the New Kingdom of Adhomai during the second civil war. Old naval culverins \
|
||||
found in museums and forgotten warehouses were adapted into portable weapons, combining modern and ancient tajaran technology. This weapon is usually found in the hands of the \
|
||||
sailors and marines of the Royal Navy."
|
||||
|
||||
/obj/item/weapon/gun/projectile/cannon/update_icon()
|
||||
if(wielded)
|
||||
item_state = "cannon-wielded"
|
||||
|
||||
@@ -190,6 +190,7 @@
|
||||
load_method = MAGAZINE
|
||||
magazine_type = /obj/item/ammo_magazine/mc9mm
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
|
||||
var/can_silence = TRUE
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/flash
|
||||
name = "9mm signal pistol"
|
||||
@@ -197,7 +198,7 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/attack_hand(mob/user as mob)
|
||||
if(user.get_inactive_hand() == src)
|
||||
if(silenced)
|
||||
if(silenced && can_silence)
|
||||
if(user.l_hand != src && user.r_hand != src)
|
||||
..()
|
||||
return
|
||||
@@ -210,7 +211,7 @@
|
||||
..()
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/attackby(obj/item/I as obj, mob/user as mob)
|
||||
if(istype(I, /obj/item/weapon/silencer))
|
||||
if(istype(I, /obj/item/weapon/silencer) && can_silence)
|
||||
if(user.l_hand != src && user.r_hand != src) //if we're not in his hands
|
||||
to_chat(user, "<span class='notice'>You'll need [src] in your hands to do that.</span>")
|
||||
return
|
||||
@@ -304,10 +305,25 @@
|
||||
desc = "A very old service pistol. Branded at the grip with the old emblem of the Sol Alliance, hand-made by Necropolis."
|
||||
icon_state = "m8"
|
||||
item_state = "pistol"
|
||||
can_silence = FALSE
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/sol/update_icon()
|
||||
..()
|
||||
if(ammo_magazine)
|
||||
icon_state = "m8"
|
||||
else
|
||||
icon_state = "m8-empty"
|
||||
icon_state = "m8-empty"
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/adhomai
|
||||
name = "adhomian service pistol"
|
||||
desc = "The Adar'Mazy pistol is an adhomian firearm commonly issued to People's Republic officers, government officials and political commissars."
|
||||
icon_state = "adhomian_pistol"
|
||||
item_state = "pistol"
|
||||
can_silence = FALSE
|
||||
|
||||
/obj/item/weapon/gun/projectile/pistol/adhomai/update_icon()
|
||||
..()
|
||||
if(ammo_magazine)
|
||||
icon_state = "adhomian_pistol"
|
||||
else
|
||||
icon_state = "adhomian_pistol-e"
|
||||
@@ -225,3 +225,13 @@
|
||||
to_chat(user, "\The [src] has a secondary barrel loaded with \a [to_print]")
|
||||
else
|
||||
to_chat(user, "\The [src] has a secondary barrel that is empty.")
|
||||
|
||||
/obj/item/weapon/gun/projectile/revolver/adhomian
|
||||
name = "adhomian service revolver"
|
||||
desc = "The Royal Firearms Service Revolver is a simple and reliable design, favored by the nobility of the New Kingdom of Adhomai."
|
||||
icon_state = "adhomian_revolver"
|
||||
caliber = "38"
|
||||
max_shells = 7
|
||||
load_method = SINGLE_CASING
|
||||
fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
|
||||
ammo_type = /obj/item/ammo_casing/c38
|
||||
|
||||
Reference in New Issue
Block a user