mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
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:
co-authored by
Contrabang
DGamerL
PollardTheDragon
warriorstar-orion
Alfalfa Scout
parent
9e7a98cefb
commit
6a1fc4f5c2
@@ -14,7 +14,8 @@
|
||||
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
|
||||
new_attack_chain = TRUE
|
||||
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'
|
||||
)
|
||||
|
||||
/// If the paddles are currently attached to the unit.
|
||||
|
||||
@@ -135,6 +135,11 @@
|
||||
desc = "An eccentric handmade standard, luxuriously soft due to exotic silks and embossed with lustrous gold. Although inspired by the pride that Nianae take in their baubles, it ultimately feels melancholic. Beauty knows no pain, afterall."
|
||||
icon_state = "nianflag"
|
||||
|
||||
/obj/item/flag/species/skulk
|
||||
name = "\improper Collective Flag"
|
||||
desc = "A foreboding flag made with silk and religious fervor. The cloth of this flag undoubtly made by faithful silk-spinners and blessed by Skkula-Kkavan priests. Some would argue its beauty does not befit it, believing it to be a beacon of zealotry that plagues the Silver Collective in its entirety."
|
||||
icon_state = "skulkflag"
|
||||
|
||||
//Department Flags
|
||||
|
||||
/obj/item/flag/cargo
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* Bones
|
||||
* Plastic
|
||||
* Saltpetre Crystal
|
||||
* Silk
|
||||
*/
|
||||
|
||||
//////////////////////////////
|
||||
@@ -825,3 +826,44 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
||||
icon_state = "sheet-saltpetre"
|
||||
singular_name = "saltpetre crystal"
|
||||
origin_tech = "materials=1;biotech=1"
|
||||
|
||||
//////////////////////////////
|
||||
// MARK: Silk
|
||||
//////////////////////////////
|
||||
GLOBAL_LIST_INIT(silk_recipes, list(
|
||||
new /datum/stack_recipe("cloth", /obj/item/stack/sheet/cloth, 1, 3, 6),
|
||||
new /datum/stack_recipe("collective jumpsuit", /obj/item/clothing/under/skulk/skulkcasual, 3, on_floor = TRUE)
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/silk
|
||||
name = "silk spool"
|
||||
desc = "A well-woven sheet of skkulakin silk. Looks like it can be used for crafting."
|
||||
icon = 'icons/obj/stacks/organic.dmi'
|
||||
icon_state = "sheet-silk"
|
||||
singular_name = "silk spool"
|
||||
force = 0
|
||||
throwforce = 0
|
||||
origin_tech = "materials=1;biotech=1"
|
||||
resistance_flags = FLAMMABLE
|
||||
merge_type = /obj/item/stack/sheet/silk
|
||||
drop_sound = 'sound/items/handling/cloth_drop.ogg'
|
||||
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
|
||||
|
||||
/obj/item/stack/sheet/silk/Initialize(mapload, new_amount, merge)
|
||||
. = ..()
|
||||
recipes = GLOB.silk_recipes
|
||||
|
||||
/obj/item/stack/sheet/silk/two
|
||||
amount = 2
|
||||
|
||||
/obj/item/stack/sheet/silk/three
|
||||
amount = 3
|
||||
|
||||
/obj/item/stack/sheet/silk/update_icon_state()
|
||||
if(amount == 1)
|
||||
icon_state = "sheet-silk"
|
||||
else if(amount == 2)
|
||||
icon_state = "sheet-silk_2"
|
||||
else
|
||||
icon_state = "sheet-silk_3"
|
||||
|
||||
|
||||
@@ -71,6 +71,8 @@
|
||||
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
|
||||
new /obj/item/clothing/head/helmet/space/plasmaman/security/hos(src)
|
||||
new /obj/item/clothing/under/plasmaman/security/hos(src)
|
||||
new /obj/item/clothing/suit/hooded/highinquis (src)
|
||||
new /obj/item/clothing/mask/highinquis (src)
|
||||
|
||||
/obj/item/storage/bag/garment/research_director
|
||||
name = "research director's garment bag"
|
||||
|
||||
@@ -418,6 +418,8 @@
|
||||
/obj/item/nullrod/fedora/Initialize(mapload)
|
||||
. = ..()
|
||||
AddElement(/datum/element/clothing_adjustment/monitor_headgear, 0, 1)
|
||||
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_headgear, skulk_adjustment)
|
||||
|
||||
/obj/item/nullrod/armblade
|
||||
name = "dark blessing"
|
||||
|
||||
@@ -17,7 +17,8 @@
|
||||
max_integrity = 300
|
||||
sprite_sheets = list(
|
||||
"Vox" = 'icons/mob/clothing/species/vox/back.dmi',
|
||||
"Grey" = 'icons/mob/clothing/species/grey/back.dmi'
|
||||
"Grey" = 'icons/mob/clothing/species/grey/back.dmi',
|
||||
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/back.dmi'
|
||||
)
|
||||
|
||||
/obj/item/storage/backpack/attackby__legacy__attackchain(obj/item/W as obj, mob/user as mob, params)
|
||||
|
||||
@@ -1076,7 +1076,8 @@
|
||||
"Drask" = 'icons/mob/clothing/species/drask/belt.dmi',
|
||||
"Grey" = 'icons/mob/clothing/species/grey/belt.dmi',
|
||||
"Kidan" = 'icons/mob/clothing/species/kidan/belt.dmi',
|
||||
"Vox" = 'icons/mob/clothing/species/vox/belt.dmi'
|
||||
"Vox" = 'icons/mob/clothing/species/vox/belt.dmi',
|
||||
"Skkulakin" = 'icons/mob/clothing/species/skkulakin/belt.dmi'
|
||||
)
|
||||
|
||||
/obj/item/storage/belt/chef/black
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
if("Body")
|
||||
if(organ_warn)
|
||||
to_chat(user, SPAN_BOLDWARNING("Using the mirror will destroy any non biochip implants in you!"))
|
||||
var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Grey", "Drask")
|
||||
var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Grey", "Drask", "Skkulakin")
|
||||
if(actually_magical)
|
||||
race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin", "Nian", "Grey", "Drask", "Vox", "Plasmaman", "Kidan", "Slime People")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user