mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 22:12:58 +01:00
Big Unathi Update (#7857)
Fixed the powered hammer's sprites being duplicated instead of mirrored across hands, increased its chance to trigger by 5% (30%).
Added a Hegemony version of the powered hammer with orange lights and a 50% chance to trigger.
Made the powered hammer reset in 30 seconds instead of 45.
Kataphracts now have new voidsuits, no longer will they wear knight armour with ponchos.
Added new Unathi non-spaceproof body armour, which is ICly a new update to the old leather looking bodyarmour.
K'lax kataphracts share the abovementioned body armour, but now have special modified helmets for all four their eyes.
Buffed the K'lax helmet ever so slightly, to be on par with the new Unathi body armour.
Fixed the Jixizi dress to be back to its former beautiful glory.
Fixed Sinta Jumpsuits allowing you to roll down people's jumpsuits and sleeves from range.
This commit is contained in:
Geeves
@@ -200,24 +200,30 @@
|
||||
|
||||
/obj/item/clothing/head/helmet/unathi
|
||||
name = "unathi helmet"
|
||||
desc = "A helmet designated to be worn by an unathi, used commonly by the hegemony levies."
|
||||
desc = "An outdated helmet designated to be worn by an Unathi, it was commonly used by the Hegemony Levies."
|
||||
icon = 'icons/obj/unathi_items.dmi'
|
||||
icon_state = "unathi_helmet"
|
||||
item_state = "unathi_helmet"
|
||||
contained_sprite = 1
|
||||
contained_sprite = TRUE
|
||||
species_restricted = list("Unathi")
|
||||
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.35
|
||||
|
||||
/obj/item/clothing/head/helmet/unathi/hegemony
|
||||
name = "hegemony helmet"
|
||||
desc = "A highly armored helmet designated to be worn by an Unathi, a newer variant commonly worn by the Hegemony Levies."
|
||||
icon_state = "hegemony_helmet"
|
||||
item_state = "hegemony_helmet"
|
||||
armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40)
|
||||
|
||||
/obj/item/clothing/head/helmet/unathi/klax
|
||||
name = "klaxan hopeful helmet"
|
||||
desc = "A helmet designated to be worn by a K'lax hopeful. The retrofit is only a bit shoddy."
|
||||
desc = "A helmet designated to be worn by a K'lax hopeful. The retrofit features a modified shape and an extra two eye visors.."
|
||||
icon = 'icons/obj/vaurca_items.dmi'
|
||||
icon_state = "klax_hopeful_helmet"
|
||||
item_state = "klax_hopeful_helmet"
|
||||
contained_sprite = 1
|
||||
species_restricted = list("Vaurca")
|
||||
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||
armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40)
|
||||
siemens_coefficient = 0.35
|
||||
|
||||
/obj/item/clothing/head/helmet/tank
|
||||
|
||||
@@ -118,33 +118,7 @@
|
||||
species_restricted = list("Human")
|
||||
refittable = FALSE
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/kataphract
|
||||
name = "kataphract voidsuit helmet"
|
||||
desc = "A tough plated helmet with slits for the eyes, emblazoned paint on the sides indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony."
|
||||
icon = 'icons/obj/clothing/species/unathi/hats.dmi'
|
||||
icon_override = 'icons/mob/species/unathi/helmet.dmi'
|
||||
icon_state = "rig0-kataphract"
|
||||
item_state = "rig0-kataphract"
|
||||
armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80)
|
||||
siemens_coefficient = 0.35
|
||||
species_restricted = list("Unathi")
|
||||
refittable = FALSE
|
||||
|
||||
/obj/item/clothing/suit/space/void/kataphract
|
||||
name = "kataphract voidsuit"
|
||||
desc = "A large suit of spaceproof armour, segmented and worked together expertly. Runic tabbard on the front and back indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony."
|
||||
icon = 'icons/obj/clothing/species/unathi/suits.dmi'
|
||||
icon_override = 'icons/mob/species/unathi/suit.dmi'
|
||||
icon_state = "rig-kataphract"
|
||||
item_state = "rig-kataphract"
|
||||
slowdown = 1
|
||||
w_class = 3
|
||||
armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80)
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
|
||||
siemens_coefficient = 0.35
|
||||
species_restricted = list("Unathi")
|
||||
refittable = FALSE
|
||||
//Freelancer voidsuit
|
||||
//Freelancer voidsuit
|
||||
/obj/item/clothing/head/helmet/space/void/freelancer
|
||||
name = "freelancer voidsuit helmet"
|
||||
desc = "An older design of special operations voidsuit helmet utilized by private military corporations."
|
||||
@@ -168,4 +142,55 @@
|
||||
armor = list(melee = 65, bullet = 55, laser = 20, energy = 15, bomb = 35, bio = 100, rad = 60)
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
|
||||
siemens_coefficient = 0.35
|
||||
species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
|
||||
species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/kataphract
|
||||
name = "kataphract voidsuit helmet"
|
||||
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony."
|
||||
icon = 'icons/obj/clothing/species/unathi/hats.dmi'
|
||||
icon_override = 'icons/mob/species/unathi/helmet.dmi'
|
||||
icon_state = "rig0-kataphract"
|
||||
item_state = "rig0-kataphract"
|
||||
armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80)
|
||||
siemens_coefficient = 0.35
|
||||
species_restricted = list("Unathi")
|
||||
refittable = FALSE
|
||||
|
||||
/obj/item/clothing/suit/space/void/kataphract
|
||||
name = "kataphract voidsuit"
|
||||
desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony."
|
||||
icon = 'icons/obj/clothing/species/unathi/suits.dmi'
|
||||
icon_override = 'icons/mob/species/unathi/suit.dmi'
|
||||
icon_state = "rig-kataphract"
|
||||
item_state = "rig-kataphract"
|
||||
slowdown = 1
|
||||
w_class = 3
|
||||
armor = list(melee = 75, bullet = 45, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 80)
|
||||
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
|
||||
siemens_coefficient = 0.35
|
||||
species_restricted = list("Unathi")
|
||||
refittable = FALSE
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/kataphract/spec
|
||||
name = "kataphract specialist voidsuit helmet"
|
||||
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist."
|
||||
icon_state = "rig0-kataphract-spec"
|
||||
item_state = "rig0-kataphract-spec"
|
||||
|
||||
/obj/item/clothing/suit/space/void/kataphract/spec
|
||||
name = "kataphract specialist voidsuit"
|
||||
desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Specialist."
|
||||
icon_state = "rig-kataphract-spec"
|
||||
item_state = "rig-kataphract-spec"
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/kataphract/lead
|
||||
name = "kataphract knight voidsuit helmet"
|
||||
desc = "A tough plated helmet with slits for the eyes, emblazoned paint across the top indicates that it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight."
|
||||
icon_state = "rig0-kataphract-lead"
|
||||
item_state = "rig0-kataphract-lead"
|
||||
|
||||
/obj/item/clothing/suit/space/void/kataphract/lead
|
||||
name = "kataphract knight voidsuit"
|
||||
desc = "A large suit of spaceproof armour, segmented and worked together expertly. Tabs on the shoulders indicate it belongs to the Kataphracts of the Unathi Izweski Hegemony. This one has the markings of a Knight."
|
||||
icon_state = "rig-kataphract-lead"
|
||||
item_state = "rig-kataphract-lead"
|
||||
@@ -511,7 +511,7 @@
|
||||
|
||||
/obj/item/clothing/suit/armor/unathi
|
||||
name = "unathi body armor"
|
||||
desc = "An armored chestplate designated to be worn by an unathi, used commonly by the hegemony levies."
|
||||
desc = "An outdated armored chestplate designated to be worn by an Unathi, it was commonly used by the Hegemony Levies."
|
||||
icon = 'icons/obj/unathi_items.dmi'
|
||||
icon_state = "unathi_armor"
|
||||
item_state = "unathi_armor"
|
||||
@@ -520,6 +520,13 @@
|
||||
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||
siemens_coefficient = 0.35
|
||||
|
||||
/obj/item/clothing/suit/armor/unathi/hegemony
|
||||
name = "hegemony body armor"
|
||||
desc = "A highly armored chestplate designated to be worn by an Unathi, a newer variant commonly worn by the Hegemony Levies."
|
||||
icon_state = "hegemony_armor"
|
||||
item_state = "hegemony_armor"
|
||||
armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40)
|
||||
|
||||
// Vaurca version of Unathi armour
|
||||
/obj/item/clothing/suit/armor/unathi/klax
|
||||
name = "klaxan hopeful body armor"
|
||||
@@ -530,7 +537,7 @@
|
||||
contained_sprite = TRUE
|
||||
species_restricted = list("Vaurca")
|
||||
allowed = list(/obj/item/gun/projectile, /obj/item/gun/energy, /obj/item/gun/launcher, /obj/item/melee, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/handcuffs, /obj/item/device/flashlight)
|
||||
armor = list(melee = 65, bullet = 30, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
|
||||
armor = list(melee = 70, bullet = 40, laser = 55, energy = 15, bomb = 25, bio = 0, rad = 40)
|
||||
siemens_coefficient = 0.35
|
||||
|
||||
/obj/item/clothing/suit/storage/vest/legion
|
||||
|
||||
@@ -56,15 +56,15 @@
|
||||
has_down_and_sleeves = FALSE
|
||||
|
||||
// Turns out normal rolling was pretty shoddy, so I made my own for 'Nathi - geeves
|
||||
/obj/item/clothing/under/unathi/rollsuit(mob/user)
|
||||
/obj/item/clothing/under/unathi/rollsuit()
|
||||
set name = "Roll Down Jumpsuit"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if(use_check_and_message(user))
|
||||
if(use_check_and_message(usr))
|
||||
return
|
||||
if(has_down_and_sleeves == FALSE)
|
||||
to_chat(user, span("notice", "You cannot roll down the [src]!"))
|
||||
to_chat(usr, span("notice", "You cannot roll down the [src]!"))
|
||||
return
|
||||
|
||||
if((rolled_sleeves == TRUE) && !(rolled_down))
|
||||
@@ -73,38 +73,38 @@
|
||||
if(rolled_down)
|
||||
body_parts_covered = initial(body_parts_covered)
|
||||
item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow.
|
||||
to_chat(user, span("notice", "You roll up your [src]."))
|
||||
to_chat(usr, span("notice", "You roll up your [src]."))
|
||||
rolled_down = FALSE
|
||||
else
|
||||
body_parts_covered &= LOWER_TORSO|LEGS|FEET
|
||||
item_state = "[initial(item_state)]_d"
|
||||
to_chat(user, span("notice", "You roll down your [src]."))
|
||||
to_chat(usr, span("notice", "You roll down your [src]."))
|
||||
rolled_down = TRUE
|
||||
update_clothing_icon()
|
||||
|
||||
/obj/item/clothing/under/unathi/rollsleeves(mob/user)
|
||||
/obj/item/clothing/under/unathi/rollsleeves()
|
||||
set name = "Roll Up Sleeves"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if(use_check_and_message(user))
|
||||
if(use_check_and_message(usr))
|
||||
return
|
||||
if(has_down_and_sleeves == FALSE)
|
||||
to_chat(user, span("notice", "You cannot roll up your [src]'s sleeves!"))
|
||||
to_chat(usr, span("notice", "You cannot roll up your [src]'s sleeves!"))
|
||||
return
|
||||
|
||||
if(rolled_down == TRUE)
|
||||
to_chat(user, span("notice", "You must roll up your [src] first!"))
|
||||
to_chat(usr, span("notice", "You must roll up your [src] first!"))
|
||||
return
|
||||
|
||||
if(rolled_sleeves)
|
||||
body_parts_covered = initial(body_parts_covered)
|
||||
item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow.
|
||||
to_chat(user, span("notice", "You roll up your [src]'s sleeves."))
|
||||
to_chat(usr, span("notice", "You roll down your [src]'s sleeves."))
|
||||
rolled_sleeves = FALSE
|
||||
else
|
||||
body_parts_covered &= ~(ARMS|HANDS)
|
||||
item_state = "[initial(item_state)]_r"
|
||||
to_chat(user, span("notice", "You roll down your [src]'s sleeves."))
|
||||
to_chat(usr, span("notice", "You roll up your [src]'s sleeves."))
|
||||
rolled_sleeves = TRUE
|
||||
update_clothing_icon()
|
||||
Reference in New Issue
Block a user