mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 04:17:33 +01:00
Adds more skrell stuff (#6991)
-adds some skrell items to the loadout -adds an unique jumpsuit to the jargon consular officer -adds some new skrell markings -adds a new sprite for a skrell holy book -adds a new skrell plant -adds some new skrell related drinks
This commit is contained in:
Alberyk
@@ -0,0 +1,155 @@
|
||||
/obj/item/stellascope
|
||||
name = "stellascope"
|
||||
desc = "An antique and delicate looking instrument used to study the stars."
|
||||
icon = 'icons/obj/skrell_items.dmi'
|
||||
icon_state = "starscope"
|
||||
w_class = 1
|
||||
matter = list("glass" = 200)
|
||||
drop_sound = 'sound/items/drop/glass.ogg'
|
||||
var/list/constellations = list("Island", "Hatching Egg", "Star Chanter", "Jiu'x'klua", "Stormcloud", "Gnarled Tree", "Poet", "Bloated Toad", "Qu'Poxiii", "Fisher")
|
||||
var/selected_constellation
|
||||
var/projection_ready = TRUE
|
||||
|
||||
/obj/item/stellascope/Initialize()
|
||||
. = ..()
|
||||
pick_constellation()
|
||||
|
||||
/obj/item/stellascope/examine(mob/user)
|
||||
..(user)
|
||||
to_chat(user, "\The [src] displays the \"[selected_constellation]\".")
|
||||
|
||||
/obj/item/stellascope/throw_impact(atom/hit_atom)
|
||||
..()
|
||||
visible_message("<span class='notice'>\The [src] lands on \the [pick_constellation()].</span>")
|
||||
|
||||
/obj/item/stellascope/attack_self(mob/user as mob)
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(isskrell(H))
|
||||
H.visible_message("<span class='notice'>\The [H] holds the brassy instrument up to \his eye and peers at something unseen.</span>",
|
||||
"<span class='notice'>You see the starry edgy of srom floating on the void of space.</span>")
|
||||
if(projection_ready)
|
||||
new/obj/effect/temp_visual/constellation (get_turf(user))
|
||||
projection_ready = FALSE
|
||||
addtimer(CALLBACK(src, .proc/rearm), 3 MINUTES)
|
||||
|
||||
|
||||
/obj/item/stellascope/proc/rearm()
|
||||
projection_ready = TRUE
|
||||
|
||||
/obj/item/stellascope/proc/pick_constellation()
|
||||
var/chosen_constellation = pick(constellations)
|
||||
selected_constellation = chosen_constellation
|
||||
return chosen_constellation
|
||||
|
||||
/obj/effect/temp_visual/constellation
|
||||
name = "starry projection"
|
||||
desc = "A holographic projection of star system."
|
||||
icon = 'icons/obj/skrell_items.dmi'
|
||||
icon_state = "starprojection"
|
||||
mouse_opacity = TRUE
|
||||
duration = 1200
|
||||
layer = LIGHTING_LAYER + 0.1
|
||||
light_power = 1
|
||||
light_range = 1
|
||||
light_color = LIGHT_COLOR_HALOGEN
|
||||
|
||||
/obj/effect/temp_visual/constellation/attackby(obj/item/W as obj, mob/user as mob)
|
||||
visible_message("<span class='notice'>\The [src] vanishes!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/effect/temp_visual/constellation/attackby(obj/item/W as obj, mob/user as mob)
|
||||
visible_message("<span class='notice'>\The [src] vanishes!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/effect/temp_visual/constellation/attack_hand(mob/user as mob)
|
||||
if(user.a_intent == I_HURT)
|
||||
visible_message("<span class='notice'>\The [src] vanishes!</span>")
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/skrell_projector
|
||||
name = "nralakk projector"
|
||||
desc = "A projector meant to help Federation Skrell feel like theyre carrying home with them wherever they go. It looks very complex."
|
||||
icon = 'icons/obj/skrell_items.dmi'
|
||||
icon_state = "projector"
|
||||
w_class = 1
|
||||
matter = list("glass" = 200)
|
||||
drop_sound = 'sound/items/drop/glass.ogg'
|
||||
var/list/worlds_selection = list("Xrim", "Kal'lo", "Nralakk")
|
||||
var/selected_world
|
||||
var/working = FALSE
|
||||
|
||||
/obj/item/skrell_projector/Destroy()
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/skrell_projector/examine(mob/user)
|
||||
..(user)
|
||||
if(selected_world && working)
|
||||
to_chat(user, "\The [src] displays the world of [selected_world].")
|
||||
|
||||
/obj/item/skrell_projector/attack_self(mob/user as mob)
|
||||
working = !working
|
||||
|
||||
if(working)
|
||||
var/choice = input("You change the projector's world to;","Change the projector's world.") as null|anything in worlds_selection
|
||||
apply_world(choice)
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
else
|
||||
set_light(0)
|
||||
working = FALSE
|
||||
icon_state = initial(icon_state)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
|
||||
/obj/item/skrell_projector/proc/apply_world(var/choice)
|
||||
set_light(2)
|
||||
if(choice)
|
||||
selected_world = choice
|
||||
|
||||
switch(choice)
|
||||
|
||||
if("Xrim")
|
||||
icon_state = "projector_pink"
|
||||
light_color = LIGHT_COLOR_PINK
|
||||
|
||||
if("Kal'lo")
|
||||
icon_state = "projector_blue"
|
||||
light_color = LIGHT_COLOR_BLUE
|
||||
|
||||
if("Nralakk")
|
||||
icon_state = "projector_purple"
|
||||
light_color = LIGHT_COLOR_PURPLE
|
||||
else
|
||||
working = FALSE
|
||||
set_light(0)
|
||||
icon_state = initial(icon_state)
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
|
||||
/obj/item/skrell_projector/process()
|
||||
if(!selected_world)
|
||||
return
|
||||
|
||||
if(prob(10))
|
||||
var/hologram_message
|
||||
switch(selected_world)
|
||||
|
||||
if("Xrim")
|
||||
hologram_message = pick("You hear strange, warbling birdsong.",
|
||||
" You see sunlight filtered through overgrown trees projected on the ceiling.",
|
||||
"You see large insects hovering above the projector.")
|
||||
|
||||
if("Kal'lo")
|
||||
hologram_message = pick("You see the ocean surface projected on the ceiling.",
|
||||
"You see colorful fish swimming above the projector.",
|
||||
"You hear the muffled sound of waves breaking above you.")
|
||||
|
||||
if("Nralakk")
|
||||
hologram_message = pick("You see the Jargon system sky projected on the ceiling.",
|
||||
"You see planets slowly orbiting Nralakk above the projector.",
|
||||
"You hear faint ceremonial hymms.")
|
||||
|
||||
if(hologram_message)
|
||||
visible_message("<span class='notice'>[hologram_message]</span>")
|
||||
@@ -6,6 +6,7 @@
|
||||
and the availability of both C'thur and Dionaea as manual labourers), allowing Federation Citizens to focus on less intensive pursuits. A rogue artificial intelligence, \
|
||||
Glorsh-Omega, has traumatized this nation for centuries to come, and the Federation is very wary of humanity, who has acquired AI technology (such as IPCs) after a Federation \
|
||||
tech leak."
|
||||
consular_outfit = /datum/outfit/job/representative/consular/jargon
|
||||
|
||||
/datum/citizenship/jargon/get_objectives(mission_level, var/mob/living/carbon/human/H)
|
||||
var/rep_objectives
|
||||
@@ -24,4 +25,9 @@
|
||||
rep_objectives = pick("Consider assisting crew within the capacity of your role, an altruistic image is good PR towards the federation",
|
||||
"Some Skrell are not part of the Federation; attempt to convince them to become a citizen")
|
||||
|
||||
return rep_objectives
|
||||
return rep_objectives
|
||||
|
||||
/datum/outfit/job/representative/consular/jargon
|
||||
name = "Jargon Consular Officer"
|
||||
|
||||
uniform = /obj/item/clothing/under/skrell
|
||||
@@ -6,7 +6,8 @@
|
||||
upon something, that while the process of how it came to be understood, the catalyst of it all is sought, as all things require some measure of action, so in order to do that, \
|
||||
the collective races needs to uncover every mystery in the galaxy in order to fully understand everything within it, and possibly beyond. This makes Qeblak a religion that highly \
|
||||
celebrates the pursuit of knowledge, exploration, science and innovation, to them, science is part of culture."
|
||||
book_name = "star keeper tome"
|
||||
book_name = "book of celestial spheres"
|
||||
book_sprite = "skrellbible"
|
||||
|
||||
/datum/religion/weishii
|
||||
name = RELIGION_WEISHII
|
||||
@@ -15,4 +16,5 @@
|
||||
the belief that the constellations all around us hold the key to understanding their fate and place in the galaxy. Whereas a member of the Qeblak faith would learn and study, a \
|
||||
member of the Weishii faith would meditate, attempt to get a deeper inner understanding. This is generally attempted through the usage of Wulumunusha, a flowering vine that has \
|
||||
came into existence following the meddling of the biosphere of Xrim by Glorsh."
|
||||
book_name = "weishii meditation booklet"
|
||||
book_name = "book of celestial spheres"
|
||||
book_sprite = "skrellbible"
|
||||
@@ -68,3 +68,21 @@
|
||||
capes["nova cape"] = /obj/item/clothing/accessory/poncho/shouldercape/nova
|
||||
capes["galaxy cape"] = /obj/item/clothing/accessory/poncho/shouldercape/galaxy
|
||||
gear_tweaks += new/datum/gear_tweak/path(capes)
|
||||
|
||||
/datum/gear/uniform/skrell
|
||||
display_name = "qeblak ceremonial garment"
|
||||
path = /obj/item/clothing/under/skrell/qeblak
|
||||
whitelisted = list("Skrell")
|
||||
sort_category = "Xenowear - Skrell"
|
||||
|
||||
/datum/gear/stellascope
|
||||
display_name = "stellascope"
|
||||
path = /obj/item/stellascope
|
||||
whitelisted = list("Skrell")
|
||||
sort_category = "Xenowear - Skrell"
|
||||
|
||||
/datum/gear/skrell_projector
|
||||
display_name = "nralakk projector"
|
||||
path = /obj/item/skrell_projector
|
||||
whitelisted = list("Skrell")
|
||||
sort_category = "Xenowear - Skrell"
|
||||
@@ -0,0 +1,43 @@
|
||||
/obj/item/clothing/under/skrell
|
||||
name = "federation uniform"
|
||||
desc = "The uniform worn by Official Jagon Federation Representatives and Diplomats. It looks pretty waterproof."
|
||||
icon = 'icons/obj/skrell_items.dmi'
|
||||
icon_state = "skrell_formal"
|
||||
item_state = "skrell_formal"
|
||||
contained_sprite = TRUE
|
||||
|
||||
/obj/item/clothing/under/skrell/qeblak
|
||||
name = "qeblak ceremonial garment"
|
||||
desc = "A traditional garment worn by Qeblak Star Keepers"
|
||||
icon_state = "qeblak_uniform"
|
||||
item_state = "qeblak_uniform"
|
||||
action_button_name = "Toggle Ceremonial Garment Lights"
|
||||
var/lights = FALSE
|
||||
|
||||
/obj/item/clothing/under/skrell/qeblak/update_icon()
|
||||
..()
|
||||
if(lights)
|
||||
item_state = "[initial(icon_state)]_on"
|
||||
else
|
||||
item_state = initial(item_state)
|
||||
|
||||
/obj/item/clothing/under/skrell/qeblak/attack_self(mob/user)
|
||||
toggle_lights()
|
||||
|
||||
/obj/item/clothing/under/skrell/qeblak/verb/toggle_lights()
|
||||
set name = "Toggle Ceremonial Garment Lights"
|
||||
set category = "Object"
|
||||
set src in usr
|
||||
|
||||
if (use_check_and_message(usr))
|
||||
return
|
||||
|
||||
lights = !lights
|
||||
|
||||
if(lights)
|
||||
set_light(2)
|
||||
else
|
||||
set_light(0)
|
||||
|
||||
update_icon()
|
||||
usr.update_inv_w_uniform()
|
||||
@@ -1332,4 +1332,22 @@
|
||||
set_trait(TRAIT_POTENCY,10)
|
||||
set_trait(TRAIT_PRODUCT_ICON,"leaves")
|
||||
set_trait(TRAIT_PRODUCT_COLOUR,"#00e0e0")
|
||||
set_trait(TRAIT_PLANT_ICON,"bush8")
|
||||
set_trait(TRAIT_PLANT_ICON,"bush8")
|
||||
|
||||
/datum/seed/wulumunusha
|
||||
name = "wulumunusha"
|
||||
seed_name = "wulumunusha"
|
||||
display_name = "wulumunusha vines"
|
||||
chems = list("wulumunusha" = list(3,5))
|
||||
kitchen_tag = "wulumunusha"
|
||||
|
||||
/datum/seed/wulumunusha/setup_traits()
|
||||
..()
|
||||
set_trait(TRAIT_MATURATION,8)
|
||||
set_trait(TRAIT_PRODUCTION,3)
|
||||
set_trait(TRAIT_YIELD,3)
|
||||
set_trait(TRAIT_POTENCY,5)
|
||||
set_trait(TRAIT_PRODUCT_ICON,"wumpafruit")
|
||||
set_trait(TRAIT_PRODUCT_COLOUR,"#61E2EC")
|
||||
set_trait(TRAIT_PLANT_ICON,"wumpavines")
|
||||
set_trait(TRAIT_WATER_CONSUMPTION, 10)
|
||||
@@ -292,4 +292,7 @@ var/global/list/plant_seed_sprites = list()
|
||||
seed_type = "ghostmushroom"
|
||||
|
||||
/obj/item/seeds/dynseed
|
||||
seed_type = "dyn"
|
||||
seed_type = "dyn"
|
||||
|
||||
/obj/item/seeds/wulumunushaseed
|
||||
seed_type = "wulumunusha"
|
||||
@@ -2793,6 +2793,13 @@ Follow by example and make good judgement based on length which list to include
|
||||
species_allowed = list("Skrell")
|
||||
do_colouration = 0
|
||||
|
||||
skr_arms
|
||||
name = "Skrell Arms"
|
||||
icon_state = "skrell_arms"
|
||||
body_parts = list("l_arm","r_arm","l_hand","r_hand")
|
||||
species_allowed = list("Skrell")
|
||||
|
||||
|
||||
// Branded IPC markings - disabled for now, some layering issues.
|
||||
/*
|
||||
bishop
|
||||
|
||||
@@ -288,7 +288,7 @@
|
||||
if(prob(50))
|
||||
M.drowsyness = max(M.drowsyness, 3)
|
||||
|
||||
/datum/reagent/toxin/krok/
|
||||
/datum/reagent/toxin/krok
|
||||
name = "Krok Juice"
|
||||
id = "krok"
|
||||
description = "An Eridanian variant of krokodil, known for causing prosthetic malfunctions."
|
||||
@@ -316,4 +316,16 @@
|
||||
H.add_chemical_effect(CE_PAINKILLER, 80) // equivalent to tramadol
|
||||
var/obj/item/organ/eyes/eyes = H.internal_organs_by_name[H.species.vision_organ || "eyes"]
|
||||
if(eyes.status & ORGAN_ROBOT)
|
||||
M.hallucination = max(M.hallucination, 40)
|
||||
M.hallucination = max(M.hallucination, 40)
|
||||
|
||||
/datum/reagent/wulumunusha
|
||||
name = "Wulumunusha Extract"
|
||||
id = "wulumunusha"
|
||||
description = "The extract of the wulumunusha fruit, it can cause hallucionations and muteness."
|
||||
color = "#61E2EC"
|
||||
taste_description = "sourness"
|
||||
fallback_specific_heat = 1
|
||||
|
||||
/datum/reagent/mindbreaker/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
M.druggy = max(M.druggy, 50)
|
||||
M.silent += 15
|
||||
@@ -3763,6 +3763,41 @@
|
||||
if(alien != IS_DIONA)
|
||||
M.make_jittery(10)
|
||||
|
||||
/datum/reagent/drink/algaesuprise
|
||||
name = "Pl'iuop Algae Surprise"
|
||||
id = "algaesuprise"
|
||||
color = "#FFFF80"
|
||||
description = "This bubbling drink gives off a faint moldy aroma."
|
||||
taste_description = "swamp fungus"
|
||||
|
||||
glass_icon_state = "algae_surprise"
|
||||
glass_name = "glass of Pl'iuop Algae Surprise"
|
||||
glass_desc = "This bubbling drink gives off a faint moldy aroma."
|
||||
|
||||
/datum/reagent/drink/xrim
|
||||
name = "Xrim Garden"
|
||||
id = "xrim"
|
||||
color = "#F6668E"
|
||||
description = "A colorful drink that smells a lot like rotten fruit."
|
||||
taste_description = "sweet, fruity slime"
|
||||
|
||||
glass_icon_state = "xrim"
|
||||
glass_name = "glass of Xrim Garden"
|
||||
glass_desc = "A colorful drink that smells a lot like rotten fruit."
|
||||
|
||||
/datum/reagent/alcohol/ethanol/rixulin_sundae
|
||||
name = "Rixulin Sundae"
|
||||
id = "rixulin_sundae"
|
||||
color = "#83E2C6"
|
||||
description = "A fizzing drink that looks like a really great time."
|
||||
taste_description = "spacetime and warbling music"
|
||||
|
||||
strength = 15
|
||||
druggy = 30
|
||||
|
||||
glass_icon_state = "rixulin_sundae"
|
||||
glass_name = "glass of Rixulin Sundae"
|
||||
glass_desc = "A fizzing drink that looks like a really great time."
|
||||
|
||||
// Butanol-based alcoholic drinks
|
||||
//=====================================
|
||||
|
||||
@@ -3088,6 +3088,27 @@
|
||||
required_reagents = list("dynjuice" = 1, "ice" = 2, "sodawater" = 2)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/drink/algaesuprise
|
||||
name = "Pl'iuop Algae Surprise"
|
||||
id = "algaesuprise"
|
||||
result = "algaesuprise"
|
||||
required_reagents = list("virusfood" = 2, "banana" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/drink/xrim
|
||||
name = "Xrim Garden"
|
||||
id = "xrim"
|
||||
result = "xrim"
|
||||
required_reagents = list("virusfood" = 2, "watermelonjuice" = 1, "orangejuice" = 1, "limejuice" = 1, "zora_cthur" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/drink/rixulin_sundae
|
||||
name = "Rixulin Sundae"
|
||||
id = "rixulin_sundae"
|
||||
result = "rixulin_sundae"
|
||||
required_reagents = list("virusfood" = 3, "wulumunusha" = 1, "whitewine" = 2)
|
||||
result_amount = 6
|
||||
|
||||
//transmutation
|
||||
|
||||
/datum/chemical_reaction/transmutation_silver
|
||||
|
||||
Reference in New Issue
Block a user