Praise Be and Skkula: The PR (Skkulakin Race 2025) [READY FOR REVIEW] (#30744)

* skulk.dm placeholder for testing purposes

* Made an oopsie, fixed

* Skulk flesh color and language color testing

* Adding working language key, fixed language color

* Changed skulk flesh color, may change it again soon

* Ran tgui, hopefully fixed language color

* Changed skulk language color, hopefully for good this time

* Missed a spot

* Tgui fuckery

* If at first you don't succeed, cry to yourself for a bit then try again

* Tgui makes me violent

* Eyewear no longer save Skkulakin from flashes

* Skulk bones now hurt really bad

* Adds Skulk Sprites, Back Accessories, and other Placeholders

* Desperately trying to get body_accessories to work

* Minor name changes

* Skkulakin now have colorable eyes

* Makes the silk-spinning ability somewhat work, more changes need to be made

* Fixes the Skulks' ability to spin silk, however still needs changes

* Changed Skulks easier bone breaks into a trait

* Skulks (Now with 100% ethically sourced back spines!)

* Gives Skkulakin the Vox clothing sprites (Not counting head, glasses, or masks)

* Added update_spines_layer() for testing and help purposes

* Working on getting Skulk Backspines to change color depending on preset

* Skulk Backspines are now colored the same as your preset up spawning in (Thank you, Qwerty)

* Undefines SILK_NUTRITION_AMOUNT (I made a woopsie)

* Readds a return I may have accidentally removed at some point

* Skkulakin can now chitter

* Silk now be used to craft cloth and has an icon

* TGUI is going to make me do things

* Fixes the Brittle Bones Trait to work with Frail Quirk

* Sprite Fix

* Adds masking helpers

* Made a small woopsie

* I'm genuinely a fucking idiot

* Adds a bunch of new clothing

* Changes some clothing descriptions

* Fixes more placeholders and adds two new outfits

* Made small mistake, fixed

* Temporary change (Will revert soon)

* Reverted previous changes as the event is now over

* New Skulk Clothing, added some to the racial tab in the loadout, and made low-inquis robes orderable from cargo

* Adds High-Inquis Robes into cargo console

* Adds Skkulakin Flag (Orderable From Merch Vendor)

* Made small mistake, fixed it

* Inquisitorial Crate only has Low-Inquisitor clothing again

* Commits all offered suggestions

* Converts spans to defines and sorts out the rest of Skulk clothing (No MODs just yet)

* Gives Skulks the Nian Butt Sprite for now

* Fixes a small error with biosuits

* Fixes small coding error

* Fixes a few mor small coding errors

* Update code/modules/mob/living/carbon/human/appearance.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/modules/economy/merch_items.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Removes 'collective' from outfit_admin.dm

* Basic Pixel-Shifting (Not Yet Complete)

* improve skulk headwear offset

* Revert "improve skulk headwear offset"

This reverts commit 2d93d61699.

* improve skulk headwear offset

* Cleans up some code and fixes ALL hats for Skkulakin

* Lets the AI speak Skkula-Runespeak, fixes Bomber Jackets and Winter Coats, makes Backpacks look better, fixes other small sprite issues

* Let them wear pants

* Update code/modules/mob/language.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Fixes masks and glasses for skkulakin

* Fixes Inquisitor Masks and adds missing Engineering Outfits

* Fixes Explorer Suits and HECK Suit for Skulks

* Fixes a few small issues and resolves some suggested changes

* Rebuilds TGUI

* Fixes Science Jumpsuits & Radsuits

* Fix Skkulakin chef belt disappearance.

* fix string assoc lookups for alists

* Update code/game/objects/structures/mirror.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species/skulk.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>

---------

Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
This commit is contained in:
AVeryReluctantSpider
2026-01-17 20:54:56 +00:00
committed by GitHub
co-authored by Contrabang DGamerL PollardTheDragon warriorstar-orion Alfalfa Scout
parent 9e7a98cefb
commit 6a1fc4f5c2
147 changed files with 1179 additions and 122 deletions
+1
View File
@@ -747,6 +747,7 @@
/datum/species/drask,
/datum/species/grey,
/datum/species/diona,
/datum/species/skulk,
)
del_types |= /obj/item/card/id
@@ -91,6 +91,24 @@
path = /obj/item/clothing/suit/hooded/vox_robes
slot = ITEM_SLOT_OUTER_SUIT
/datum/gear/racial/skulk_casual
display_name = "Collective jumpsuit"
description = "A grey, insulated jumpsuit made from a hardweave composite. Despite their cheap, mass-produced nature, this suit is seen on every caste from the lowliest Agrolyte to the Prodigium themselves."
path = /obj/item/clothing/under/skulk/skulkcasual
slot = ITEM_SLOT_JUMPSUIT
/datum/gear/racial/skulk_robes
display_name = "Collective robes"
description = "A set of comfortable purple robes made from silk and faux gold, offers substantial protection from the cold. Worn by faithful commoners and Skkula-Kkavan zealots everywhere."
path = /obj/item/clothing/suit/collectiverobe
slot = ITEM_SLOT_OUTER_SUIT
/datum/gear/racial/lowinquis
display_name = "Low-Inquisitor robes"
description = "A set of red and silver Collective robes with armor plates sewn into important areas. A common sight amongst the Collective Inquisition."
path = /obj/item/clothing/suit/hooded/lowinquis
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/racial/plasmamansuit_coke
display_name = "Coke Suit"
description = "Plasmaman envirosuit designed by Space Cola Co and gifted to the people of Boron as part of an elaborate advertisement campaign."
+5 -2
View File
@@ -243,6 +243,7 @@
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/color.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/color.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/color.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/color.dmi'
)
@@ -294,7 +295,8 @@
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
var/datum/action/item_action/chameleon_change/chameleon_action
@@ -573,7 +575,8 @@
/obj/item/storage/backpack/chameleon
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
"Vox" = 'icons/mob/clothing/species/vox/back.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/back.dmi'
)
var/datum/action/item_action/chameleon_change/chameleon_action
+5 -1
View File
@@ -253,6 +253,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
)
@@ -611,6 +612,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/shoes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/shoes.dmi'
)
@@ -977,7 +979,8 @@
resistance_flags = NONE
hide_tail_by_species = null
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
insert_max = 0 // No inserts for space suits
@@ -998,6 +1001,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/misc.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/misc.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/misc.dmi'
)
+3
View File
@@ -1,5 +1,8 @@
/obj/item/clothing/glasses/Initialize(mapload)
. = ..()
var/skulk_adjustment = string_assoc_list(alist(SOUTH = list(-1, 0), NORTH = list(-1, 0), EAST = list(0, -2), WEST = list(0, 2)))
AddElement(/datum/element/clothing_adjustment/skulk_glasses, skulk_adjustment)
if(prescription_upgradable && prescription)
upgrade_prescription()
@@ -46,6 +46,7 @@
var/can_be_cut = 1
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
@@ -154,6 +155,7 @@
inhand_icon_state = "lgloves"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
@@ -173,6 +175,7 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 115, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
@@ -12,6 +12,7 @@
clipped = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
@@ -44,6 +45,7 @@
armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 50, RAD = 0, FIRE = 200, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
@@ -85,6 +87,7 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
@@ -100,6 +103,7 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
@@ -237,6 +241,7 @@
siemens_coefficient = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi'
+6 -2
View File
@@ -72,7 +72,10 @@
desc = "A rather grisly selection of cured hides and skin, sewn together to form a ragged mantle."
icon_state = "mantle-unathi"
inhand_icon_state = "old_mantle"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/neck.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/neck.dmi'
)
/obj/item/clothing/neck/cloak/captain_mantle
name = "captain's mantle"
@@ -119,5 +122,6 @@
"Drask" = 'icons/mob/clothing/species/drask/neck.dmi',
"Grey" = 'icons/mob/clothing/species/grey/neck.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi',
"Vox" = 'icons/mob/clothing/species/vox/neck.dmi'
"Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/neck.dmi'
)
@@ -209,3 +209,33 @@
. = ..()
if(magpulse)
. += "It would be hard to take these off without relaxing your grip first."//theoretically this message should only be seen by the wearer when the claws are equipped.
// Skkulakin Uniform
/obj/item/clothing/under/skulk
icon = 'icons/obj/clothing/species/skkulakin/uniforms.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/under/misc.dmi' // Placeholder, change if you want to add more stuff
inhand_icon_state = "bl_suit"
sprite_sheets = list(
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/misc.dmi'
)
/obj/item/clothing/under/skulk/skulkcasual
name = "collective jumpsuit"
desc = "A grey, insulated jumpsuit made from a hardweave composite. Despite their cheap, mass-produced nature, this suit is seen on every caste from the lowliest Agrolyte to the Prodigium themselves."
icon_state = "skulkcasual"
worn_icon_state = "skulkcasual"
species_restricted = list("Skkulakin")
/obj/item/clothing/suit/collectiverobe
name = "collective robe"
desc = "A set of comfortable purple robes made from silk and faux gold, offering substantial protection from the cold. Worn by faithful commoners and Skkula-Kkavan zealots everywhere."
icon = 'icons/obj/clothing/species/skkulakin/suits.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/suit.dmi'
icon_state = "collectiverobe"
inhand_icon_state = "coatwinter"
species_restricted = list("Skkulakin")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
@@ -69,6 +69,7 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
@@ -189,6 +190,7 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
)
hide_tail_by_species = list("Unathi", "Tajaran", "Vox", "Vulpkanin")
@@ -143,6 +143,7 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
@@ -27,7 +27,10 @@
inhand_icon_state = "capspacesuit"
allowed = list(/obj/item/tank/internals, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Deathsquad space suit, not hardsuits because no flashlight!
/obj/item/clothing/head/helmet/space/deathsquad
@@ -185,6 +188,7 @@
w_class = WEIGHT_CLASS_NORMAL
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Skrell" = 'icons/mob/clothing/species/skrell/suit.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
@@ -201,6 +205,7 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
)
@@ -232,7 +237,10 @@
desc = ". . ."
icon_state = "spacemime_suit"
inhand_icon_state = null
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/head/helmet/space/eva/clown
name = "clown EVA helmet"
@@ -246,4 +254,7 @@
desc = "An EVA suit specifically designed for the clown. SPESSHONK!"
icon_state = "spaceclown_suit"
inhand_icon_state = null
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
@@ -30,6 +30,7 @@
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Green syndicate space suit
+3 -1
View File
@@ -25,7 +25,9 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Colors!!!
/obj/item/clothing/head/helmet/space/void/green
+17 -2
View File
@@ -12,6 +12,7 @@
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
w_class = WEIGHT_CLASS_NORMAL
@@ -25,6 +26,7 @@
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/armor/vest/jacket
@@ -81,6 +83,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -115,6 +118,7 @@
adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -129,6 +133,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -147,6 +152,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -180,6 +186,7 @@
dog_fashion = null
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -202,6 +209,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
@@ -234,6 +242,7 @@
// Drask look fine in the regular human version
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
)
@@ -251,6 +260,7 @@
put_on_delay = 60
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -266,7 +276,10 @@
icon_state = "knight_green"
inhand_icon_state = null
slowdown = 1
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
hide_tail_by_species = list("Vox")
/obj/item/clothing/suit/armor/riot/knight/yellow
@@ -307,6 +320,7 @@
put_on_delay = 6 SECONDS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -845,7 +859,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/head/hooded/bone_light
+2 -1
View File
@@ -47,7 +47,8 @@
"Vox" = 'icons/mob/clothing/species/vox/suits/bio.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/bio.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/bio.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/bio.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/suits/bio.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/bio.dmi'
)
//Medical biosuit, white with blue
+42 -14
View File
@@ -9,7 +9,10 @@
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list(/obj/item/reagent_containers/spray/plantbgone,/obj/item/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/cultivator,/obj/item/reagent_containers/spray/pestspray,/obj/item/hatchet,/obj/item/storage/bag/plants)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
// Smith
/obj/item/clothing/suit/apron/smith
@@ -25,7 +28,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/utility.dmi'
)
//Chaplain
@@ -41,7 +45,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -58,7 +63,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -74,7 +80,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -89,7 +96,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -104,7 +112,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -119,7 +128,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Chaplain
@@ -133,7 +143,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/witchhunter
@@ -162,6 +173,7 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/chef/red
@@ -198,7 +210,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
// Librarian
@@ -212,7 +225,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Detective
@@ -229,9 +243,10 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
)
//Forensics
@@ -271,6 +286,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
@@ -288,6 +304,7 @@
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi'
@@ -324,6 +341,7 @@
body_parts_covered = UPPER_TORSO | ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
@@ -359,6 +377,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
@@ -374,6 +393,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
@@ -392,6 +412,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
@@ -407,6 +428,7 @@
insert_max = 2
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
@@ -425,7 +447,10 @@
suit_adjusted = 1
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Mime
/obj/item/clothing/suit/suspenders
@@ -434,7 +459,9 @@
icon = 'icons/obj/clothing/belts.dmi'
icon_state = "suspenders"
blood_overlay_type = "armor" //it's the less thing that I can put here
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi')
/obj/item/clothing/suit/suspenders/nodrop
flags = NODROP
@@ -455,6 +482,7 @@
body_parts_covered = UPPER_TORSO|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+1
View File
@@ -14,6 +14,7 @@
species_exception = list(/datum/species/golem)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/labcoat.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/labcoat.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/labcoat.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/labcoat.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/labcoat.dmi'
+217 -30
View File
@@ -19,7 +19,10 @@
allowed = list (/obj/item/gun/energy/laser/tag/blue)
resistance_flags = NONE
insert_max = 0
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/redtag
name = "red laser tag armour"
@@ -30,7 +33,10 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
allowed = list (/obj/item/gun/energy/laser/tag/red)
resistance_flags = NONE
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/*
* Costume
@@ -40,14 +46,20 @@
desc = "Yarr."
icon_state = "pirate_old"
insert_max = 0
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/pirate_black
name = "black pirate coat"
desc = "Yarr."
icon_state = "pirate"
insert_max = 0
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/hgpirate
name = "pirate captain coat"
@@ -96,7 +108,8 @@
insert_max = 0
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/apron/overalls
@@ -118,7 +131,9 @@
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/hastur
name = "Hastur's robes"
@@ -222,7 +237,10 @@
name = "poncho"
desc = "Your classic, non-racist poncho."
icon_state = "classicponcho"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/poncho/green
name = "green poncho"
@@ -328,7 +346,10 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
flags = THICKMATERIAL
hoodtype = /obj/item/clothing/head/hooded/bee_hood
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
insert_max = 0
/obj/item/clothing/head/hooded/bee_hood
@@ -366,7 +387,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/hooded/costume/nun
@@ -381,7 +403,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/costume/bana
@@ -394,7 +417,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/costume/joue
@@ -407,7 +431,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/costume/miko
@@ -420,7 +445,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/costume/hasidic_coat
@@ -432,7 +458,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/*
@@ -454,7 +481,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suits/coat.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/coat.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/coat.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/coat.dmi'
)
/obj/item/clothing/head/hooded/winterhood
@@ -487,7 +515,8 @@
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/pimpcoat/white
@@ -726,8 +755,11 @@
hoodtype = /obj/item/clothing/head/hooded/ablative
strip_delay = 3 SECONDS
put_on_delay = 4 SECONDS
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
var/last_reflect_time
var/reflect_cooldown = 4 SECONDS
@@ -756,7 +788,10 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen)
hoodtype = /obj/item/clothing/head/hooded/hood
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/head/hooded/hood
name = "black hood"
@@ -832,7 +867,10 @@
name = "worn shirt"
desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it but it's pretty close. Good for sleeping in."
icon_state = "ianshirt"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//coats
@@ -850,7 +888,10 @@
suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/blacktrenchcoat
name = "black trench coat"
@@ -860,7 +901,10 @@
suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//trackjackets
@@ -873,7 +917,10 @@
suit_adjusted = 1
actions_types = list(/datum/action/item_action/openclose)
adjust_flavour = "unzip"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/tracksuit/green
name = "green tracksuit"
@@ -895,7 +942,10 @@
actions_types = list()
adjust_flavour = null
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy,/obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/energy/detective)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/jacket/miljacket/navy
name = "navy military jacket"
@@ -962,6 +1012,7 @@
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -983,6 +1034,7 @@
icon_state = "varsity_classic"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
@@ -992,6 +1044,7 @@
icon_state = "varsity_sport"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
@@ -1001,6 +1054,7 @@
icon_state = "varsity_blood"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
@@ -1010,6 +1064,7 @@
icon_state = "driver_jacket"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi'
)
@@ -1022,7 +1077,8 @@
adjust_flavour = null
resistance_flags = NONE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/jacket/motojacket
@@ -1033,6 +1089,7 @@
actions_types = list(/datum/action/item_action/zipper)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -1044,7 +1101,8 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Bomber jackets
@@ -1060,6 +1118,7 @@
actions_types = list(/datum/action/item_action/zipper)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/coat.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/coat.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/coat.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/coat.dmi'
@@ -1176,7 +1235,10 @@
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/soldiercoat
name = "clown soldier's coat"
@@ -1185,7 +1247,10 @@
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/button)
adjust_flavour = "unbutton"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/sovietcoat
name = "\improper Soviet greatcoat"
@@ -1402,6 +1467,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
@@ -1471,7 +1537,8 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/hooded/dark_robes
@@ -1481,4 +1548,124 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/dark_hood
allowed = list(/obj/item/storage/bible, /obj/item/nullrod, /obj/item/reagent_containers/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen)
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
// For Skulk Clothing
/obj/item/clothing/suit/hooded/lowinquis
name = "low-inquisitor robes"
desc = "A set of red and silver Collective robes with armor plates sewn into important areas. A common sight amongst the Collective Inquisition."
icon = 'icons/obj/clothing/species/skkulakin/suits.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/suit.dmi'
icon_state = "lowinquis"
hoodtype = /obj/item/clothing/head/hooded/lowinquis
inhand_icon_state = "coatsecurity"
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 20, ACID = 20)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
species_restricted = list("Skkulakin")
/obj/item/clothing/head/hooded/lowinquis
name = "low-inquisitor hood"
desc = "An armored hood attached to inquisitorial robes."
icon = 'icons/obj/clothing/species/skkulakin/hats.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/head.dmi'
icon_state = "lowinquis"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS
species_restricted = list("Skkulakin")
/obj/item/clothing/suit/hooded/highinquis
name = "high-inquisitor robes"
desc = "A set of black and gold Collective robes with reinforced armor plates sewn within the hardweave composite cloth. These are commonly worn by commanders within the Collective Inquisition."
icon = 'icons/obj/clothing/species/skkulakin/suits.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/suit.dmi'
icon_state = "highinquis"
hoodtype = /obj/item/clothing/head/hooded/highinquis
inhand_icon_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 115, ACID = 450)
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
strip_delay = 80
insert_max = 2
species_restricted = list("Skkulakin")
/obj/item/clothing/head/hooded/highinquis
name = "high-inquisitor hood"
desc = "An armored hood attached to inquisitorial robes."
icon = 'icons/obj/clothing/species/skkulakin/hats.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/head.dmi'
icon_state = "highinquis"
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75)
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags = BLOCKHAIR
flags_inv = HIDEEARS
species_restricted = list("Skkulakin")
/obj/item/clothing/mask/lowinquis
name = "low-inquisitor mask"
desc = "A silver mask affixed to a balaclava designed to easily fit the face of a Skkulakin. Despite its retinal scanners being disabled, it still protects the user from bright flashes."
icon = 'icons/obj/clothing/species/skkulakin/masks.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/mask.dmi'
icon_state = "inquismask"
flags = BLOCKHAIR | AIRTIGHT
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
w_class = WEIGHT_CLASS_NORMAL
species_restricted = list("Skkulakin")
/obj/item/clothing/mask/highinquis
name = "high-inquisitor mask"
desc = "A golden mask affixed to a balaclava designed to easily fit the face of a Skkulakin. Despite its retinal scanners being disabled, it still protects the user from bright flashes and looks incredibly snazzy while doing so."
icon = 'icons/obj/clothing/species/skkulakin/masks.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/mask.dmi'
icon_state = "highinquismask"
flags = BLOCKHAIR | AIRTIGHT
flash_protect = FLASH_PROTECTION_FLASH
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
w_class = WEIGHT_CLASS_NORMAL
species_restricted = list("Skkulakin")
/obj/item/clothing/suit/supremeinquis
name = "supreme-inquisitor robe"
desc = "Beautiful, gilded robes adorned with runes, symbols, and Collective imagery."
icon = 'icons/obj/clothing/species/skkulakin/suits.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/suit.dmi'
icon_state = "supremeinquis"
armor = list(MELEE = 15, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 0, ACID = 50)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
insert_max = 3
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
species_restricted = list("Skkulakin")
/obj/item/clothing/head/supremeinquis
name = "supreme-inquisitor helmet"
desc = "An electrum-alloy helmet designed to fit the head of a Skkulakin. Offering protection from threats both physical and paranormal."
icon = 'icons/obj/clothing/species/skkulakin/hats.dmi'
worn_icon = 'icons/mob/clothing/species/skkulakin/head.dmi'
icon_state = "supremeinquis"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
w_class = WEIGHT_CLASS_NORMAL
flags = HEADBANGPROTECT|BLOCKHAIR
flags_cover = HEADCOVERSEYES
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
species_restricted = list("Skkulakin")
+2 -1
View File
@@ -1,7 +1,8 @@
//Unathi clothing.
/obj/item/clothing/suit/unathi
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/unathi/robe
+8 -3
View File
@@ -43,7 +43,8 @@
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/utility.dmi'
)
/obj/item/clothing/suit/fire/firefighter/atmos
@@ -98,7 +99,10 @@
strip_delay = 70
put_on_delay = 70
resistance_flags = NONE
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
@@ -164,7 +168,8 @@
"Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suits/utility.dmi'
)
rad_insulation_alpha = RAD_FULL_INSULATION
rad_insulation_beta = RAD_FULL_INSULATION
+1
View File
@@ -131,6 +131,7 @@
inhand_icon_state = "bl_suit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -119,7 +119,10 @@
name = "waistcoat"
desc = "For some classy, murderous fun."
icon_state = "waistcoat"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
//Medals
/obj/item/clothing/accessory/medal
@@ -335,6 +338,7 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/neck.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/neck.dmi',
"Grey" = 'icons/mob/clothing/species/grey/neck.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/neck.dmi',
)
@@ -443,55 +447,82 @@
name = "black cowboy shirt"
desc = "For a real western look. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/short_sleeved
name = "shortsleeved black cowboy shirt"
desc = "For when it's a hot day in the west. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_s"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white
name = "white cowboy shirt"
desc = "For the rancher in us all. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_white"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/white/short_sleeved
name = "short sleeved white cowboy shirt"
desc = "Best for midday cattle tending. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_whites"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink
name = "pink cowboy shirt"
desc = "For only the manliest of men, or girliest of girls. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_pink"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/pink/short_sleeved
name = "short sleeved pink cowboy shirt"
desc = "For a real buckle bunny. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_pinks"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy
name = "navy cowboy shirt"
desc = "Now yer a real cowboy. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_navy"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
name = "short sleeved navy cowboy shirt"
desc = "Sometimes ya need to roll up your sleeves. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_navys"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red
name = "red cowboy shirt"
desc = "It's high noon. Looks like it can clip on to a uniform."
icon_state = "cowboyshirt_red"
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/cowboyshirt/red/short_sleeved
name = "short sleeved red cowboy shirt"
@@ -499,6 +530,7 @@
icon_state = "cowboyshirt_reds"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
@@ -77,7 +77,8 @@
desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/accessory/storage/black_vest
+1
View File
@@ -7,6 +7,7 @@
inhand_icon_state = "g_suit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/centcom.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/centcom.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/centcom.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/centcom.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/centcom.dmi'
+1
View File
@@ -5,6 +5,7 @@
dyeable = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/color.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/color.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/color.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/color.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/color.dmi'
+5
View File
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/costumes.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/costumes.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/costumes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/costumes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/costumes.dmi'
)
@@ -113,6 +114,7 @@
//it is what it is
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/costumes.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/costumes.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/costumes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/costumes.dmi'
)
@@ -169,6 +171,7 @@
worn_icon = 'icons/mob/clothing/under/civilian.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/civilian.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi'
@@ -182,6 +185,7 @@
worn_icon = 'icons/mob/clothing/under/civilian.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/civilian.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi'
@@ -195,6 +199,7 @@
worn_icon = 'icons/mob/clothing/under/civilian.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/civilian.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi'
+1
View File
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/dress.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/dress.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/dress.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/dress.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/dress.dmi'
)
@@ -6,6 +6,7 @@
worn_icon = 'icons/mob/clothing/under/captain.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/captain.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/captain.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/captain.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/captain.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/captain.dmi',
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/cargo.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/cargo.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/cargo.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/cargo.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/cargo.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/cargo.dmi'
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/civilian.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/civilian.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/civilian.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/civilian.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/civilian.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/civilian.dmi'
@@ -4,6 +4,7 @@
inhand_icon_state = "engi_suit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/engineering.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/engineering.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/engineering.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/engineering.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/engineering.dmi'
@@ -4,6 +4,7 @@
inhand_icon_state = "nursesuit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/medical.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/medical.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/medical.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/medical.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/medical.dmi'
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/procedure.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/procedure.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/procedure.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/procedure.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/procedure.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/procedure.dmi'
+1
View File
@@ -3,6 +3,7 @@
worn_icon = 'icons/mob/clothing/under/rnd.dmi'
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/rnd.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/rnd.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/rnd.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/rnd.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/rnd.dmi'
@@ -6,6 +6,7 @@
strip_delay = 50
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi'
)
@@ -30,6 +31,7 @@
icon_state = "ward_turtle"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi'
@@ -93,6 +95,7 @@
inhand_icon_state = "bl_suit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi'
@@ -154,6 +157,7 @@
icon_state = "hos_turtle"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi'
@@ -73,7 +73,8 @@
"Drask" = 'icons/mob/clothing/species/drask/under/misc.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/misc.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/misc.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi'
"Vox" = 'icons/mob/clothing/species/vox/under/misc.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/misc.dmi'
)
/obj/item/clothing/under/misc/burial
+1
View File
@@ -6,6 +6,7 @@
displays_id = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/pants.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/pants.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/pants.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/pants.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/pants.dmi'
+1
View File
@@ -4,6 +4,7 @@
inhand_icon_state = "bl_suit"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/vox/under/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/suit.dmi'
@@ -9,6 +9,7 @@
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 35)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/under/syndicate.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/under/syndicate.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/syndicate.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/syndicate.dmi'
)
+7
View File
@@ -229,6 +229,13 @@
cost = 500
category = MERCH_CAT_DECORATION
/datum/merch_item/flag_skulk
name = "Skkulakin Flag"
desc = "The foreboding flag of the Silver Collective. Blessed by Skkula-Kkavan priests."
typepath = /obj/item/flag/species/skulk
cost = 500
category = MERCH_CAT_DECORATION
/datum/merch_item/flag_ian
name = "Ian Flag"
desc = "The banner of Ian, because SQUEEEEE."
@@ -18,7 +18,8 @@
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi'
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/head/hooded/explorer
@@ -58,7 +59,8 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi'
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/suit.dmi'
)
/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
+17
View File
@@ -411,6 +411,23 @@
new_name += " [pick("Alkaid","Andromeda","Antlia","Apus","Auriga","Caelum","Camelopardalis","Canes Venatici","Carinae","Cassiopeia","Centauri","Circinus","Cygnus","Dorado","Draco","Eridanus","Errakis","Fornax","Gliese","Grus","Horologium","Hydri","Lacerta","Leo Minor","Lupus","Lynx","Maffei","Megrez","Messier","Microscopium","Monocerotis","Muscae","Ophiuchi","Orion","Pegasi","Persei","Perseus","Polaris","Pyxis","Sculptor","Syrma","Telescopium","Tianyi","Triangulum","Trifid","Tucana","Tycho","Vir","Volans","Zavyava")]"
return new_name
/datum/language/skulk
name = "Skkula-Runespeak"
desc = "A language comprised mostly of chittering, laced with psionic resonations used to convey urgency and emotion. Utterly esoteric to the unenlightened."
speech_verb = "resonates"
ask_verb = "pulses"
exclaim_verbs = list("thunders")
whisper_verb = "warps"
colour = "skulk"
key = "8"
flags = RESTRICTED | WHITELISTED
syllables = list("┤ᖋ|:ᖋᔮᒣ╎ᔮ", "ᖋリᒣ|:॥.", "ᒣ⍑ᒷ ▭", "⍊ᒷ∷", "ᒷ⎓", "╎リ┤ ▭ ⍑╎ᒲ")
/datum/language/skulk/get_random_name()
var/new_name = "[pick("Akki", "Akku", "Avvi", "Bakku", "Bakki", "Bakk", "Kkath", "Makkith", "Vullo", "Mortis", "Vaal", "Kkari", "Thrakk", "Skkiv", "Llav", "Vykke", "Hakki", "Askki", "Tavv", "Maskii", "Tokko", "Kkavik", "Morkk", "Savv")]"
new_name += "-[pick("Akku", "Avvi", "Bakku", "Bakki", "Bakk", "Kkath", "Makkith", "Vullo", "Mortis", "Vaal", "Kkari", "Thrakk", "Skkiv", "Llav", "Vykke", "Hakki", "Askki", "Tavv", "Maskii", "Tokko", "Kkavik", "Morkk", "Savv")]"
return new_name
/datum/language/common
name = "Galactic Common"
desc = "Originally a carefully crafted fusion of various Human and Skrell dialects, Galactic Common is the most commonly spoken language in the Sector, and incorporates influences from nearly every known sapient species."
@@ -121,6 +121,7 @@
m_styles["tail"] = "None"
update_tail_layer()
update_wing_layer()
update_spines_layer()
return TRUE
/mob/living/carbon/human/proc/change_alt_head(alternate_head)
@@ -274,3 +274,31 @@ GLOBAL_LIST_EMPTY(body_accessory_by_species)
/datum/body_accessory/wing/bluespace
name = "Bluespace Wings"
icon_state = "bluespace"
// Skulk spines
/datum/body_accessory/spines
icon = 'icons/mob/sprite_accessories/skulk/skulk_spines.dmi'
animated_icon = null
name = "Report this bug on github"
icon_state = "hunter1"
allowed_species = list("Skkulakin")
has_behind = TRUE
/datum/body_accessory/spines/hunter
name = "Hunter"
/datum/body_accessory/spines/cosmic
name = "Cosmic"
icon_state = "cosmic1"
/datum/body_accessory/spines/illusive
name = "Illusive"
icon_state = "illusive1"
/datum/body_accessory/spines/venom
name = "Venom"
icon_state = "venom1"
/datum/body_accessory/spines/hunger1
name = "Hunger"
icon_state = "hunger1"
@@ -94,6 +94,8 @@
var/tail
/// Same as tail but wing
var/wing
/// Same as wing but with back spines
var/spines
var/tail_wagging = FALSE
@@ -667,6 +667,16 @@
sound = 'sound/effects/mob_effects/flutter.ogg'
species_type_whitelist_typecache = list(/datum/species/moth)
/datum/emote/living/carbon/human/chitter
key = "chitter"
key_third_person = "chitters"
message = "chitters."
message_param = "chitters at %t."
emote_type = EMOTE_AUDIBLE
sound = "sound/effects/chitter.ogg"
species_type_whitelist_typecache = list(/datum/species/skulk)
muzzled_noises = list("frustrated")
/datum/emote/living/carbon/human/quill
key = "quill"
key_third_person = "quills"
@@ -242,6 +242,9 @@
if(!body_accessory)
change_body_accessory("Plain Wings")
/mob/living/carbon/human/skulk/Initialize(mapload)
. = ..(mapload, /datum/species/skulk)
/mob/living/carbon/human/get_status_tab_items()
var/list/status_tab_data = ..()
. = status_tab_data
@@ -863,8 +866,9 @@
var/obj/item/clothing/head/HFP = head //if yes gets the flash protection value from that item
number += HFP.flash_protect
if(istype(glasses, /obj/item/clothing/glasses)) //glasses
var/obj/item/clothing/glasses/GFP = glasses
number += GFP.flash_protect
if(!is_species(src, /datum/species/skulk)) // makes sure skkulakin properly suffer
var/obj/item/clothing/glasses/GFP = glasses
number += GFP.flash_protect
if(istype(wear_mask, /obj/item/clothing/mask)) //mask
var/obj/item/clothing/mask/MFP = wear_mask
number += MFP.flash_protect
@@ -1216,6 +1220,8 @@
wing = dna.species.wing
spines = dna.species.spines
maxHealth = dna.species.total_health
if(dna.species.language)
@@ -104,10 +104,9 @@ Please contact me on #coderbus IRC. ~Carn x
*/
/mob/living/carbon/human/proc/apply_overlay(cache_index)
. = overlays_standing[cache_index]
SEND_SIGNAL(src, COMSIG_CARBON_APPLY_OVERLAY, cache_index, .)
if(.)
add_overlay(.)
SEND_SIGNAL(src, COMSIG_CARBON_APPLY_OVERLAY, cache_index)
if(overlays_standing[cache_index])
add_overlay(overlays_standing[cache_index])
/mob/living/carbon/human/proc/remove_overlay(cache_index)
var/I = overlays_standing[cache_index]
@@ -275,6 +274,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
//tail
update_tail_layer()
update_wing_layer()
update_spines_layer()
update_int_organs()
//head accessory
update_head_accessory()
@@ -421,7 +421,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
return
var/species_name = ""
if(dna.species.name in list("Drask", "Grey", "Vox", "Kidan"))
if(dna.species.name in list("Drask", "Grey", "Vox", "Kidan", "Skkulakin"))
species_name = "_[lowertext(dna.species.sprite_sheet_name)]"
var/icon/hands_mask = icon('icons/mob/body_accessory.dmi', "accessory_none_s") //Needs a blank icon, not actually related to markings at all
@@ -562,6 +562,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
force_update_limbs()
update_tail_layer()
update_wing_layer()
update_spines_layer()
update_halo_layer()
update_eyes_overlay_layer()
overlays.Cut() // Force all overlays to regenerate
@@ -887,6 +888,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
apply_overlay(SUIT_LAYER)
update_tail_layer()
update_wing_layer()
update_spines_layer()
update_collar()
/mob/living/carbon/human/update_inv_pockets()
@@ -1146,12 +1148,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(!istype(body_accessory, /datum/body_accessory/wing))
if(dna.species.optional_body_accessory)
return
else
body_accessory = GLOB.body_accessory_by_name[dna.species.default_bodyacc]
if(istype(body_accessory, /datum/body_accessory/spines))
return // fuck right off thanks
body_accessory = GLOB.body_accessory_by_name[dna.species.default_bodyacc]
if(!body_accessory.try_restrictions(src))
return
var/icon/wings_icon = new /icon(body_accessory.icon, body_accessory.icon_state)
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
wings_icon.ColorTone(COLORTONE_DEAD_EXT_ORGAN)
@@ -1174,6 +1175,41 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
apply_overlay(WING_UNDERLIMBS_LAYER)
apply_overlay(WING_LAYER)
/mob/living/carbon/human/proc/update_spines_layer()
remove_overlay(SPINES_UNDERLIMBS_LAYER)
remove_overlay(SPINES_LAYER)
if(!istype(body_accessory, /datum/body_accessory/spines))
if(dna.species.optional_body_accessory)
return
if(istype(body_accessory, /datum/body_accessory/wing))
return // See above
body_accessory = GLOB.body_accessory_by_name[dna.species.default_bodyacc]
if(!body_accessory.try_restrictions(src))
return
var/icon/spines_icon = new /icon(body_accessory.icon, spines)
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
spines_icon.ColorTone(COLORTONE_DEAD_EXT_ORGAN)
spines_icon.SetIntensity(0.7)
var/mutable_appearance/spines_ma = mutable_appearance(spines_icon, layer = -SPINES_LAYER)
spines_ma.pixel_x = body_accessory.pixel_x_offset
spines_ma.pixel_y = body_accessory.pixel_y_offset
overlays_standing[SPINES_LAYER] = spines_ma
if(body_accessory.has_behind)
var/icon/under_spines_icon = new /icon(body_accessory.icon, "[spines]_BEHIND")
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
under_spines_icon.ColorTone(COLORTONE_DEAD_EXT_ORGAN)
under_spines_icon.SetIntensity(0.7)
var/mutable_appearance/under_spines = mutable_appearance(under_spines_icon, layer = -SPINES_UNDERLIMBS_LAYER)
under_spines.pixel_x = body_accessory.pixel_x_offset
under_spines.pixel_y = body_accessory.pixel_y_offset
overlays_standing[SPINES_UNDERLIMBS_LAYER] = under_spines
apply_overlay(SPINES_UNDERLIMBS_LAYER)
apply_overlay(SPINES_LAYER)
// Warning to all that come here: This proc is also used to properly render nian wings and skulk spines. Also it sucks. Have fun!
/mob/living/carbon/human/proc/update_tail_layer()
// If the tail is currently wagging, don't stop wagging.
if(tail_wagging)
@@ -1198,7 +1234,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
if(body_accessory)
if(body_accessory.try_restrictions(src))
var/icon/accessory_s = new/icon("icon" = body_accessory.icon, "icon_state" = body_accessory.icon_state)
var/icon/accessory_s
if(istype(body_accessory, /datum/body_accessory/spines))
accessory_s = new/icon("icon" = body_accessory.icon, "icon_state" = spines)
else
accessory_s = new/icon("icon" = body_accessory.icon, "icon_state" = body_accessory.icon_state)
if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS))
accessory_s.ColorTone(COLORTONE_DEAD_EXT_ORGAN)
accessory_s.SetIntensity(0.7)
@@ -1382,8 +1422,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/handle_transform_change()
..()
update_tail_layer()
update_wing_layer()
update_body()
//Adds a collar overlay above the helmet layer if the suit has one
// Suit needs an identically named sprite in icons/mob/clothing/collar.dmi
@@ -29,6 +29,8 @@
var/tail
/// like tail but wings
var/wing
/// like wings but spines
var/spines
var/datum/unarmed_attack/unarmed //For empty hand harm-intent attack
var/unarmed_type = /datum/unarmed_attack
@@ -0,0 +1,147 @@
/datum/species/skulk
name = "Skkulakin"
name_plural = "Skkulakin"
max_age = 70
icobase = 'icons/mob/human_races/skulk/r_skulkbrown.dmi'
language = "Skkula-Runespeak"
unarmed_type = /datum/unarmed_attack/claws
blurb = "The Skkulakin are a species of psionically-attuned furred arthropods hailing from the Western Orion Spur. \
Originating from the planet Votum-Accorium, an arctic world ruled by the brutal theocratic government known as the Silver Collective.<br/><br/> \
Despite owning a large amount of territory in the western arm of the sector, the plasma supply their empire relies on is being stretched thin. \
This has forced the once-proud species to desperately branch out and seek a solution to their critical shortage."
cold_level_1 = 240
cold_level_2 = 180
cold_level_3 = 100
heat_level_1 = 340
heat_level_2 = 380
heat_level_3 = 440
brain_mod = 0.8
species_traits = list()
inherent_traits = list(TRAIT_BRITTLE_BONES)
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_BUG
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_BODY_MARKINGS | HAS_BACK_SPINES | HAS_ICON_SKIN_TONE | SHAVED | HAS_BODY_ACCESSORY
dietflags = DIET_OMNI
flesh_color = "#e3e2dd"
default_hair = "Scribe"
default_bodyacc = "Illusive"
spines = "Illusive1"
eyes = "skulk_eyes_s"
butt_sprite = "nian"
optional_body_accessory = FALSE
reagent_tag = PROCESS_ORG
icon_skin_tones = alist(
1 = "Blackgate",
2 = "Talwyrm",
3 = "Valcore",
4 = "Ossya",
5 = "Highfield",
6 = "Votum-Accorium"
)
has_organ = list(
"heart" = /obj/item/organ/internal/heart/skulk,
"lungs" = /obj/item/organ/internal/lungs/skulk,
"liver" = /obj/item/organ/internal/liver/skulk,
"kidneys" = /obj/item/organ/internal/kidneys/skulk,
"brain" = /obj/item/organ/internal/brain/skulk,
"eyes" = /obj/item/organ/internal/eyes/skulk
)
suicide_messages = list(
"is attempting to blow up their mind with their mind!",
"is jamming their claws into their eye sockets!",
"is tearing open their arm with their fangs!",
"is twisting their own neck!",
"is holding their breath!")
/datum/species/skulk/on_species_gain(mob/living/carbon/human/H)
..()
updatespeciescolor(H)
H.update_icons()
var/datum/action/innate/spin_silk/spin_silk = new()
spin_silk.Grant(H)
/datum/species/skulk/on_species_loss(mob/living/carbon/human/H)
..()
for(var/datum/action/innate/spin_silk/spin_silk in H.actions)
spin_silk.Remove(H)
/datum/species/skulk/updatespeciescolor(mob/living/carbon/human/H, owner_sensitive = 1) // Handling species-specific skin-tones for the Skulk race.
if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE)
var/new_icobase = 'icons/mob/human_races/skulk/r_skulkblack.dmi' // Default Blackgate Skkulakin.
var/current_spine_type = null
if(H.body_accessory)
current_spine_type = lowertext("[H.body_accessory.name]")
var/chosen_spine_color = 1
switch(H.s_tone)
if(1) // Blackgate Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkblack.dmi'
chosen_spine_color = 1
if(2) // Talwyrm Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkbrown.dmi'
chosen_spine_color = 2
if(3) // Valcore Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkred.dmi'
chosen_spine_color = 3
if(4) // Ossya Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkblue.dmi'
chosen_spine_color = 4
if(5) // Highfield Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkgreen.dmi'
chosen_spine_color = 5
if(6) // Votum-Accorium Skkulakin.
new_icobase = 'icons/mob/human_races/skulk/r_skulkwhite.dmi'
chosen_spine_color = 6
if(H.body_accessory && current_spine_type)
H.spines = "[current_spine_type][chosen_spine_color]"
H.change_icobase(new_icobase, owner_sensitive)
/datum/action/innate/spin_silk
name = "Spin Silk"
desc = "Use your spinnerets to create a spool of silk that can be used for crafting."
check_flags = AB_CHECK_HANDS_BLOCKED | AB_CHECK_STUNNED | AB_CHECK_RESTRAINED | AB_CHECK_CONSCIOUS
button_icon = 'icons/obj/stacks/organic.dmi'
button_icon_state = "sheet-silk"
var/cooldown = 0
var/cooldown_duration = 10 SECONDS
#define SILK_NUTRITION_AMOUNT 90
/datum/action/innate/spin_silk/Activate()
var/mob/living/carbon/human/user = owner
if(world.time <= cooldown)
to_chat(user, SPAN_WARNING("You are still recovering from spinning silk. Wait [round((cooldown - world.time) / 10)] seconds and try again."))
return
var/mob/living/carbon/human/skulk/H = owner
if(H.nutrition < SILK_NUTRITION_AMOUNT)
to_chat(user, SPAN_WARNING("You are too hungry to spin silk right now."))
return
var/obj/item/stack/sheet/silk/silk
if(user.get_active_hand() && user.get_inactive_hand())
to_chat(user, SPAN_WARNING("You don't have any free hands!"))
return
H.visible_message(SPAN_WARNING("[H] begins spinning a small amount of silk..."), SPAN_WARNING("You begin spinning a small amount of silk... (This will take [5] seconds, and you must hold still.)"))
if(!do_after_once(H, 5 SECONDS, TRUE, H, attempt_cancel_message = "You stop spinning silk."))
if(H.incapacitated())
to_chat(user, SPAN_WARNING("You cannot spin silk in your current state!"))
return
silk = new(get_turf(H), 1)
user.put_in_hands(silk)
cooldown = world.time + cooldown_duration
H.adjust_nutrition(-SILK_NUTRITION_AMOUNT)
to_chat(user, SPAN_WARNING("You spin a small amount of silk."))
#undef SILK_NUTRITION_AMOUNT
@@ -253,6 +253,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
add_language("Bubblish", 1)
add_language("Clownish", 1)
add_language("Tkachi", 1)
add_language("Skkula-Runespeak", 1)
if(!safety)//Only used by AIize() to successfully spawn an AI.
if(!B)//If there is no player/brain inside.
@@ -78,6 +78,7 @@
user.add_language("Clownish")
user.add_language("Cygni Standard")
user.add_language("Tkachi")
user.add_language("Skkula-Runespeak")
else
user.remove_language("Sinta'unathi")
user.remove_language("Siik'tajr")
@@ -91,6 +92,7 @@
user.remove_language("Clownish")
user.remove_language("Cygni Standard")
user.remove_language("Tkachi")
user.remove_language("Skkula-Runespeak")
/datum/pai_software/translator/is_active(mob/living/silicon/pai/user)
return user.translator_on
@@ -293,6 +293,7 @@
R.add_language("Orluum", FALSE)
R.add_language("Clownish", FALSE)
R.add_language("Tkachi", FALSE)
R.add_language("Skkula-Runespeak", FALSE)
///Adds armor to a cyborg. Normaly resets it to 0 across the board, unless the module has an armor defined.
/obj/item/robot_module/proc/add_armor(mob/living/silicon/robot/R)
@@ -670,6 +671,7 @@
R.add_language("Clownish",1)
R.add_language("Cygni Standard", 1)
R.add_language("Tkachi", 1)
R.add_language("Skkula-Runespeak", 1)
// Mining
/obj/item/robot_module/miner
@@ -0,0 +1,23 @@
/datum/sprite_accessory/body_markings/tattoo/skulk
icon = 'icons/mob/sprite_accessories/skulk/skulk_body_markings.dmi'
species_allowed = list("Skkulakin")
/datum/sprite_accessory/body_markings/tattoo/skulk/danger_skulk
name = "Danger"
icon_state = "danger"
/datum/sprite_accessory/body_markings/tattoo/skulk/royal_skulk
name = "Royal"
icon_state = "royal"
/datum/sprite_accessory/body_markings/tattoo/skulk/grunt_skulk
name = "Grunt"
icon_state = "grunt"
/datum/sprite_accessory/body_markings/tattoo/skulk/mantis_skulk
name = "Mantis"
icon_state = "mantis"
/datum/sprite_accessory/body_markings/tattoo/skulk/striped_skulk
name = "Striped"
icon_state = "striped"
@@ -0,0 +1,76 @@
/datum/sprite_accessory/hair/skulk
icon = 'icons/mob/sprite_accessories/skulk/skulk_hair.dmi'
species_allowed = list("Skkulakin")
glasses_over = 1
/datum/sprite_accessory/hair/skulk/artificer
name = "Artificer"
icon_state = "artificer"
/datum/sprite_accessory/hair/skulk/priest
name = "Priest"
icon_state = "priest"
/datum/sprite_accessory/hair/skulk/cleric
name = "Cleric"
icon_state = "cleric"
/datum/sprite_accessory/hair/skulk/brewmaster
name = "Brewmaster"
icon_state = "brewmaster"
/datum/sprite_accessory/hair/skulk/alchemist
name = "Alchemist"
icon_state = "alchemist"
/datum/sprite_accessory/hair/skulk/agrolyte
name = "Agrolyte"
icon_state = "agrolyte"
/datum/sprite_accessory/hair/skulk/monk
name = "Monk"
icon_state = "monk"
/datum/sprite_accessory/hair/skulk/archivist
name = "Archivist"
icon_state = "archivist"
/datum/sprite_accessory/hair/skulk/scribe
name = "Scribe"
icon_state = "scribe"
/datum/sprite_accessory/hair/skulk/seer
name = "Seer"
icon_state = "seer"
/datum/sprite_accessory/hair/skulk/warrior
name = "Warrior"
icon_state = "warrior"
/datum/sprite_accessory/hair/skulk/lowinquis
name = "Low-Inquisitor"
icon_state = "lowinquis"
/datum/sprite_accessory/hair/skulk/highinquis
name = "High-Inquisitor"
icon_state = "highinquis"
/datum/sprite_accessory/hair/skulk/supremeinquis
name = "Supreme-Inquisitor"
icon_state = "supremeinquis"
/datum/sprite_accessory/hair/skulk/acolyte
name = "Acolyte"
icon_state = "acolyte"
/datum/sprite_accessory/hair/skulk/highacolyte
name = "High-Acolyte"
icon_state = "highacolyte"
/datum/sprite_accessory/hair/skulk/lordforeman
name = "Lord-Foreman"
icon_state = "lordforeman"
/datum/sprite_accessory/hair/skulk/silverinquis
name = "Silver-Inquisitor"
icon_state = "silverinquis"
@@ -76,7 +76,7 @@
icon = 'icons/mob/human_face.dmi' // Keep bald hair here, as for some reason, putting it elsewhere lead to it being colourable - Also it make sense as it is shared by everyone.
name = "Bald"
icon_state = "bald"
species_allowed = list("Human", "Unathi", "Vox", "Diona", "Kidan", "Grey", "Plasmaman", "Skeleton", "Vulpkanin", "Tajaran", "Nian")
species_allowed = list("Human", "Unathi", "Vox", "Diona", "Kidan", "Grey", "Plasmaman", "Skeleton", "Vulpkanin", "Tajaran", "Nian", "Skulk")
glasses_over = 1
/datum/sprite_accessory/facial_hair
@@ -96,7 +96,7 @@
/datum/sprite_accessory/head_accessory/none
name = "None"
species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox")
species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox", "Skulk")
/* BODY MARKINGS */
@@ -171,17 +171,18 @@
///////////////////////////
/datum/sprite_accessory/underwear
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
"Grey" = 'icons/mob/clothing/species/grey/underwear.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/underwear.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/underwear.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/underwear.dmi'
)
/datum/sprite_accessory/underwear/nude
name = "Nude"
icon_state = null
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
/datum/sprite_accessory/underwear/male
body_type = MALE
@@ -301,17 +302,18 @@
////////////////////////////
/datum/sprite_accessory/undershirt
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
"Grey" = 'icons/mob/clothing/species/grey/underwear.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/underwear.dmi'
"Kidan" = 'icons/mob/clothing/species/kidan/underwear.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/underwear.dmi'
)
/datum/sprite_accessory/undershirt/nude
name = "Nude"
icon_state = null
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
//plain color shirts
/datum/sprite_accessory/undershirt/shirt_white
@@ -583,18 +585,18 @@
///////////////////////
/datum/sprite_accessory/socks
icon = 'icons/mob/clothing/underwear.dmi'
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/underwear.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/underwear.dmi',
"Nian" = 'icons/mob/clothing/species/nian/underwear.dmi'
"Nian" = 'icons/mob/clothing/species/nian/underwear.dmi',
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/underwear.dmi'
)
/datum/sprite_accessory/socks/nude
name = "Nude"
icon_state = null
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian")
species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox", "Nian", "Skkulakin")
/datum/sprite_accessory/socks/white_norm
name = "Normal White"
+3 -3
View File
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
A.close()
var/list/ert_species_prefs = list()
for(var/mob/M in GLOB.response_team_members)
ert_species_prefs.Add(input_async(M, "Please select a species (10 seconds):", list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Drask", "Kidan", "Grey", "Random")))
ert_species_prefs.Add(input_async(M, "Please select a species (10 seconds):", list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Drask", "Kidan", "Grey", "Skkulakin", "Random")))
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(get_ert_role_prefs), GLOB.response_team_members, ert_gender_prefs, ert_species_prefs), 10 SECONDS)
/proc/get_ert_role_prefs(list/response_team_members, list/ert_gender_prefs, list/ert_species_prefs) // Why the FUCK is this variable the EXACT SAME as the global one
@@ -143,7 +143,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
if(!new_species)
new_species = "Human"
if(new_species == "Random")
new_species = pick("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Drask", "Kidan", "Grey")
new_species = pick("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Drask", "Kidan", "Grey", "Skkulakin")
var/datum/species/S = GLOB.all_species[new_species]
var/species = S.type
M.set_species(species, TRUE)
@@ -154,7 +154,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages)
var/eye_c = pick("#000000", "#8B4513", "#1E90FF", "#8c00ff", "#a80c0c", "#2fdb63") // Black, brown, blue, purple, red, green
switch(new_species) //Diona not included as they don't use the hair colours, kidan use accessory, drask are skin tone Grey not included as they are BALD
if("Human", "Tajaran", "Vulpkanin", "Nian")
if("Human", "Tajaran", "Vulpkanin", "Nian","Skkulakin")
var/hair_c_htvn = pick("#8B4513", "#000000", "#FF4500", "#FFD700", "#d4d1bf") // Brown, black, red, blonde, grey
head_organ.facial_colour = hair_c_htvn
head_organ.sec_facial_colour = hair_c_htvn
@@ -422,6 +422,18 @@
cost = 200
containername = "security clothing crate"
/// Has a bunch of neat equipment for Skulk Officers, do note only Skkulakin can use these items
/datum/supply_packs/security/lowinquisitor
name = "Low-Inquisitor Clothing Crate"
contains = list(/obj/item/clothing/suit/hooded/lowinquis,
/obj/item/clothing/suit/hooded/lowinquis,
/obj/item/clothing/suit/hooded/lowinquis,
/obj/item/clothing/mask/lowinquis,
/obj/item/clothing/mask/lowinquis,
/obj/item/clothing/mask/lowinquis)
cost = 300
containername = "low-inquisitorial clothing crate"
/// Starter pack for an officer. Contains everything in a locker but backpack (officer already start with one). Convenient way to equip new officer on highpop.
/datum/supply_packs/security/officerpack
name = "Officer Starter Pack"
@@ -539,11 +539,13 @@ Note that amputating the affected organ does in fact remove the infection from t
//Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status.
/obj/item/organ/external/proc/check_fracture(damage_inflicted)
var/frail_multiplier = 1
var/brittle_bones_multiplier = 1
if(owner)
frail_multiplier = HAS_TRAIT(owner, TRAIT_FRAIL) ? 2 : 1
brittle_bones_multiplier = HAS_TRAIT(owner, TRAIT_BRITTLE_BONES) ? 1.2 : 1
var/adjusted_broken_damage = min_broken_damage / frail_multiplier
if(GLOB.configuration.general.breakable_bones && brute_dam > adjusted_broken_damage && !is_robotic())
if(prob(damage_inflicted * frail_multiplier))
if(prob(damage_inflicted * (frail_multiplier + brittle_bones_multiplier)))
fracture()
/obj/item/organ/external/proc/check_for_internal_bleeding(damage)
@@ -0,0 +1,26 @@
/obj/item/organ/internal/eyes/skulk
name = "skkulakin eyeballs"
desc = "A strange set of beady-looking eyes."
icon = 'icons/obj/species_organs/skulk.dmi'
/obj/item/organ/internal/liver/skulk
name = "skkulakin liver"
desc = "A rather disgusting looking liver of some bug thing."
icon = 'icons/obj/species_organs/skulk.dmi'
/obj/item/organ/internal/heart/skulk
name = "skkulakin heart"
icon = 'icons/obj/species_organs/skulk.dmi'
/obj/item/organ/internal/brain/skulk
icon = 'icons/obj/species_organs/skulk.dmi'
desc = "It quietly hums with psionic resonance."
mmi_icon = 'icons/obj/species_organs/skulk.dmi'
/obj/item/organ/internal/lungs/skulk
name = "skkulakin lungs"
icon = 'icons/obj/species_organs/skulk.dmi'
/obj/item/organ/internal/kidneys/skulk
name = "skkulakin kidneys"
icon = 'icons/obj/species_organs/skulk.dmi'