cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds some Skrell weapons/armour/uniforms for the Skrell team. (#14490)

Browse Source
This commit is contained in:
Matt Atlas
2022-09-07 13:42:13 +02:00
committed by GitHub
parent 64b2c37981
commit 24e733588c
17 changed files with 331 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/color.dm
+9 -1
View File
@@ -206,4 +206,12 @@
desc = "A key design element in the labwear was utility and compatibility with the Zeng-Hu positronic chassis workers that are ubiquitous throughout the corporation. \
As a result they are breathable yet non-porous, allowing for ample airflow while retaining the cleanroom standards expected of a medical and scientific uniform."
icon_state = "zeng_gloves"
item_state = "zeng_gloves"
item_state = "zeng_gloves"
/obj/item/clothing/gloves/kala
name = "skrell gloves"
desc = "A sleek pair of gloves! They seem to be retaining moisture."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "kala_gloves"
item_state = "kala_gloves"
contained_sprite = TRUE
code/modules/clothing/shoes/miscellaneous.dm
+8
View File
@@ -296,3 +296,11 @@ obj/item/clothing/shoes/sandal/clogs
armor = list(
bio = ARMOR_BIO_RESISTANT
)
/obj/item/clothing/shoes/jackboots/kala
name = "skrell boots"
desc = "A sleek pair of boots. They seem to be retaining moisture."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "kala_boots"
item_state = "kala_boots"
contained_sprite = TRUE
code/modules/clothing/spacesuits/rig/suits/skrell.dm
+14 -5
View File
@@ -47,16 +47,19 @@
/obj/item/clothing/head/helmet/space/rig/skrell/tup
light_overlay = "helmet_light_tadpole"
/obj/item/clothing/head/helmet/space/rig/skrell/tup/modern
light_overlay = "tup2_rig_helmetlight"
/obj/item/rig/skrell/tup
name = "tup suit control module"
desc = "A suit control module designed by the Nralakk Federation for Tup operations. The best of the best."
name = "outdated tupkala suit control module"
desc = "A suit control module designed by the Jargon Federation for Tup operations. The best of the best, albeit outdated now."
icon = 'icons/clothing/rig/tup.dmi'
icon_state = "tup_rig"
suit_type = "tup suit"
armor = list(
melee = ARMOR_MELEE_VERY_HIGH,
bullet = ARMOR_BALLISTIC_AP,
laser = ARMOR_LASER_AP,
bullet = ARMOR_BALLISTIC_RIFLE,
laser = ARMOR_LASER_MAJOR,
energy = ARMOR_ENERGY_STRONG,
bomb = ARMOR_BOMB_RESISTANT,
bio = ARMOR_BIO_SHIELDED,
@@ -81,4 +84,10 @@
/obj/item/rig_module/teleporter/skrell
)
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL
/obj/item/rig/skrell/tup/modern
name = "tupkala suit control module"
desc = "This is the suit control module for the Tupkala RIG. It's one of the most advanced pieces of technology in the Spur."
icon_state = "tup2_rig"
helm_type = /obj/item/clothing/head/helmet/space/rig/skrell/tup/modern
code/modules/clothing/spacesuits/void/alien.dm
+88 -17
View File
@@ -48,27 +48,77 @@
icon_state = "skrell_suit_black"
item_state = "skrell_suit_black"
/obj/item/clothing/head/helmet/space/void/pra
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"
/obj/item/clothing/suit/space/void/kala
name = "qukala voidsuit"
desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Jargon Federation emblem on it."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "kala_suit"
item_state = "kala_suit"
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_PISTOL,
energy = ARMOR_ENERGY_MINOR,
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_RIFLE,
laser = ARMOR_LASER_MEDIUM,
energy = ARMOR_ENERGY_SMALL,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_RESISTANT
rad = ARMOR_RAD_SHIELDED
)
species_restricted = list(BODYTYPE_TAJARA)
refittable = FALSE
desc_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
species_restricted = list(BODYTYPE_SKRELL)
/obj/item/clothing/head/helmet/space/void/kala
name = "qukala voidsuit helmet"
desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Jargon Federation emblem on it."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "kala_helm"
item_state = "kala_helm"
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_RIFLE,
laser = ARMOR_LASER_MEDIUM,
energy = ARMOR_ENERGY_SMALL,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_SHIELDED
)
species_restricted = list(BODYTYPE_SKRELL)
/obj/item/clothing/suit/space/void/kala/med
name = "qukala medical voidsuit"
desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala medic."
icon_state = "kala_med"
item_state = "kala_med"
/obj/item/clothing/head/helmet/space/void/kala/med
name = "qukala medical voidsuit helmet"
desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala medic."
icon_state = "kala_helm_med"
item_state = "kala_helm_med"
/obj/item/clothing/suit/space/void/kala/leader
name = "qukala leader voidsuit"
desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala leader."
icon_state = "kala_leader"
item_state = "kala_leader"
/obj/item/clothing/head/helmet/space/void/kala/leader
name = "qukala leader voidsuit helmet"
desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala leader."
icon_state = "kala_leader_helm"
item_state = "kala_leader_helm"
/obj/item/clothing/suit/space/void/kala/engineering
name = "qukala engineer voidsuit"
desc = "A sleek skrell voidsuit that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala engineer."
icon_state = "kala_eng"
item_state = "kala_eng"
/obj/item/clothing/head/helmet/space/void/kala/engineering
name = "qukala engineer voidsuit helmet"
desc = "A sleek skrell voidsuit helmet that slightly shimmers as it moves. This one has a Jargon Federation emblem on it. This one belongs to a Qukala engineer."
icon_state = "kala_helm_eng"
item_state = "kala_helm_eng"
/obj/item/clothing/suit/space/void/pra
name = "kosmostrelki voidsuit"
@@ -91,3 +141,24 @@
protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
/obj/item/clothing/head/helmet/space/void/pra
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"
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_PISTOL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_PADDED,
bio = ARMOR_BIO_SHIELDED,
rad = ARMOR_RAD_RESISTANT
)
species_restricted = list(BODYTYPE_TAJARA)
refittable = FALSE
desc_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \
protection from NanoTrasen and the Sol Alliance in order to defend their orbit from raiders. However, the Republican Navy has striven to become independent. With the help of \
contracted engineers, access to higher education abroad and training from Sol Alliance naval advisers, the People's Republic has been able to commission and crew some of its own \
ships. The Republican Navy's space-arm primarily conducts counter piracy operations in conjunction with fending off raiders."
code/modules/clothing/suits/armor.dm
+15
View File
@@ -577,6 +577,21 @@
)
contained_sprite = TRUE
/obj/item/clothing/suit/storage/vest/kala
name = "kala armor vest"
desc = "A simple armor vest issued to all of the Kala. It's made of an advanced lightweight alloy."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "kala_armor"
item_state = "kala_armor"
armor = list(
melee = ARMOR_MELEE_KNIVES,
bullet = ARMOR_BALLISTIC_PISTOL,
laser = ARMOR_LASER_MAJOR,
energy = ARMOR_ENERGY_SMALL,
bomb = ARMOR_BOMB_PADDED
)
contained_sprite = TRUE
//All of the armor below is mostly unused
/obj/item/clothing/suit/armor/centcomm
code/modules/clothing/under/accessories/armor.dm
+13
View File
@@ -209,6 +209,19 @@
name = "heavy corporate arm guards"
icon_state = "armguards_sec_heavy"
item_state = "armguards_sec_heavy"
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_REVOLVER,
laser = ARMOR_LASER_MEDIUM,
energy = ARMOR_ENERGY_SMALL,
bomb = ARMOR_BOMB_PADDED,
)
/obj/item/clothing/accessory/arm_guard/kala
name = "kala arm guards"
desc = "These arm guards are made out of an advanced lightweight alloy."
icon_state = "armguards_sec_heavy"
item_state = "armguards_sec_heavy"
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_REVOLVER,
code/modules/clothing/under/xenos/skrell.dm
+68
View File
@@ -343,4 +343,72 @@
icon = 'icons/obj/contained_items/skrell/nralakk_jackets.dmi'
item_state = "starcoat"
icon_state = "starcoat"
/obj/item/clothing/under/skrell/cthur
name = "cthur uniform"
desc = "This white vaurca wetsuit is often worn by C’thur working with the Kala, most often the Qukala. It has ablative materials woven in."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "cthur_uniform"
item_state = "cthur_uniform"
contained_sprite = TRUE
armor = list(
laser = ARMOR_LASER_SMALL
)
species_restricted = list(BODYTYPE_VAURCA)
/obj/item/clothing/under/skrell/qukala
name = "qukala uniform"
desc = "This combat-grade wetsuit is issued to the Qukala to be worn in the field. It has small kinetic dampeners woven in."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "qukala_uniform"
item_state = "qukala_uniform"
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_SMALL,
bullet = ARMOR_BALLISTIC_MINOR
)
/obj/item/clothing/under/skrell/nlomkala
name = "nlomkala uniform"
desc = "A robust wetsuit designed for police work, it is often worn by the Nlomkala. It has small kinetic dampeners woven in."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "nlom_uniform"
item_state = "nlom_uniform"
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_SMALL,
bullet = ARMOR_BALLISTIC_MINOR
)
/obj/item/clothing/under/skrell/ruupkala
name = "ruupkala uniform"
desc = "An uncommon sight in the Federation. This is a field-issue Ruupkala wetsuit equipped with small kinetic dampeners."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "ruup_uniform"
item_state = "ruup_uniform"
contained_sprite = TRUE
armor = list(
melee = ARMOR_MELEE_SMALL,
bullet = ARMOR_BALLISTIC_MINOR
)
/obj/item/clothing/under/skrell/sromkala
name = "sromkala uniform"
desc = "This comfortable and breathable wetsuit belongs to the Sromkala. It makes their extended times of slumber all the more cozy."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "srom_uniform"
item_state = "srom_uniform"
contained_sprite = TRUE
/obj/item/clothing/under/skrell/tupkala
name = "tupkala uniform"
desc = "This purple wetsuit belongs to the infamous Tupkala. It is made of some kind of exotic material."
icon = 'icons/clothing/kit/skrell_armor.dmi'
icon_state = "tup_uniform"
item_state = "tup_uniform"
armor = list(
melee = ARMOR_MELEE_SMALL,
bullet = ARMOR_BALLISTIC_MINOR,
laser = ARMOR_LASER_MINOR
)
contained_sprite = TRUE
code/modules/projectiles/guns/energy/nuclear.dm
+27 -1
View File
@@ -243,4 +243,30 @@
firemodes = list(
list(mode_name="disable", projectile_type=/obj/item/projectile/beam/stun/skrell, fire_sound='sound/weapons/Laser2.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pulse/skrell, fire_sound='sound/weapons/Laser3.ogg', burst = 2, burst_delay = 2)
)
)
/obj/item/gun/energy/gun/qukala
name = "tqi-qop rifle"
desc = "The Tqi-Qop Rifle is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell."
desc_fluff = ""
icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
icon_state = "qukalagun"
item_state = "qukalagun"
fire_sound = 'sound/weapons/Taser.ogg'
slot_flags = SLOT_BELT
accuracy = 2
max_shots = 25
secondary_projectile_type = /obj/item/projectile/beam
secondary_fire_sound = 'sound/weapons/laser1.ogg'
can_switch_modes = 1
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
modifystate = "energystun"
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/midlaser/skrell, fire_sound='sound/weapons/laser1.ogg')
)
has_item_ratio = FALSE
code/modules/projectiles/guns/energy/rifle.dm
+11 -1
View File
@@ -224,4 +224,14 @@
self_recharge = 1
use_external_power = 1
recharge_time = 10
can_turret = 0
can_turret = 0
/obj/item/gun/energy/rifle/laser/qukala
name = "geop cannon"
desc = "An advanced weapon of Skrell design, this Geop Cannon uses a tiny warp accelerator to super heat particles."
desc_fluff = ""
icon = 'icons/obj/contained_items/skrell/skrell_weaponry.dmi'
icon_state = "qukala_heavy"
item_state = "qukala_heavy"
max_shots = 10
projectile_type = /obj/item/projectile/beam/midlaser/skrell/heavy
code/modules/projectiles/projectile/beams.dm
+7
View File
@@ -51,6 +51,13 @@
damage = 35
armor_penetration = 10
/obj/item/projectile/beam/midlaser/skrell
armor_penetration = 0
/obj/item/projectile/beam/midlaser/skrell/heavy
damage = 40
armor_penetration = 20
/obj/item/projectile/beam/noctiluca
damage = 25
armor_penetration = 25