mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-22 23:15:13 +00:00
be0e6efdf6
About The Pull Request
Reorganizes the entire icons/mob folder.
Added the following new subfolders:
nonhuman-player (this was initially just called "antag", but then I realized guardians aren't technically antags)
simplemob
silicon
effects (for bloodstains, fire, etc)
simplemob/held-pets (for exactly that -- I wasn't sure if this should go in inhands instead)
species/monkey
Moves the following stuff:
All human parts moved into species, with moth, lizard, monkey, etc parts moved to corresponding subfolders. Previously, there were some moth parts in mob/species/moth, and others just loose in mob. Other species were similar.
icemoon, lavaland, and jungle folders made into subfolders of simplemob
All AI and silicon stuff, as well as Beepsky et al. into the silicon folder, simplemobs into the simplemob folder, aliens into the nonhuman-player folder, etc.
Split up animal_parts.dmi into two bodyparts.dmi which were put in their respective folders (species/alien and species/monkey)
Code changes:
Filepath changes to account for all of this
Adds a check when performing surgery on monkeys and xenos, because we can no longer assume their limbs are in the same file
Turns some hardcoded statues and showcases that were built into maps into objects instead
Things I'd like to do in the future but cant be assed right now:
Remove primarily-antag sprites from simplemob/mob.dmi (Revenant, Morph, etc.) and put them in the nonhuman-player folder
Split up mutant_bodyparts.dmi into different files for Tizirans, Felinids, monkeys, etc and put them in their own folders. Those may have once been meant primarily for mutated humans but that's now how they're being used right now.
185 lines
5.2 KiB
Plaintext
185 lines
5.2 KiB
Plaintext
/// Determines what accessories your ghost will look like they have.
|
|
/datum/preference/choiced/ghost_accessories
|
|
savefile_key = "ghost_accs"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
|
|
/datum/preference/choiced/ghost_accessories/init_possible_values()
|
|
return list(GHOST_ACCS_NONE, GHOST_ACCS_DIR, GHOST_ACCS_FULL)
|
|
|
|
/datum/preference/choiced/ghost_accessories/create_default_value()
|
|
return GHOST_ACCS_DEFAULT_OPTION
|
|
|
|
/datum/preference/choiced/ghost_accessories/apply_to_client(client/client, value)
|
|
var/mob/dead/observer/ghost = client.mob
|
|
if (!istype(ghost))
|
|
return
|
|
|
|
ghost.ghost_accs = value
|
|
ghost.update_appearance()
|
|
|
|
/datum/preference/choiced/ghost_accessories/deserialize(input, datum/preferences/preferences)
|
|
// Old ghost preferences used to be 1/50/100.
|
|
// Whoever did that wasted an entire day of my time trying to get those sent
|
|
// properly, so I'm going to buck them.
|
|
if (isnum(input))
|
|
switch (input)
|
|
if (1)
|
|
input = GHOST_ACCS_NONE
|
|
if (50)
|
|
input = GHOST_ACCS_DIR
|
|
if (100)
|
|
input = GHOST_ACCS_FULL
|
|
|
|
return ..(input)
|
|
|
|
/// Determines the appearance of your ghost to others, when you are a BYOND member
|
|
/datum/preference/choiced/ghost_form
|
|
savefile_key = "ghost_form"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
should_generate_icons = TRUE
|
|
|
|
var/static/list/ghost_forms = list(
|
|
"catghost" = "Cat",
|
|
"ghost" = "Default",
|
|
"ghost_black" = "Black",
|
|
"ghost_blazeit" = "Blaze it",
|
|
"ghost_blue" = "Blue",
|
|
"ghost_camo" = "Camo",
|
|
"ghost_cyan" = "Cyan",
|
|
"ghost_dblue" = "Dark blue",
|
|
"ghost_dcyan" = "Dark cyan",
|
|
"ghost_dgreen" = "Dark green",
|
|
"ghost_dpink" = "Dark pink",
|
|
"ghost_dred" = "Dark red",
|
|
"ghost_dyellow" = "Dark yellow",
|
|
"ghost_fire" = "Fire",
|
|
"ghost_funkypurp" = "Funky purple",
|
|
"ghost_green" = "Green",
|
|
"ghost_grey" = "Grey",
|
|
"ghost_mellow" = "Mellow",
|
|
"ghost_pink" = "Pink",
|
|
"ghost_pinksherbert" = "Pink Sherbert",
|
|
"ghost_purpleswirl" = "Purple Swirl",
|
|
"ghost_rainbow" = "Rainbow",
|
|
"ghost_red" = "Red",
|
|
"ghost_yellow" = "Yellow",
|
|
"ghostian2" = "Ian",
|
|
"ghostking" = "King",
|
|
"skeleghost" = "Skeleton",
|
|
)
|
|
|
|
/datum/preference/choiced/ghost_form/init_possible_values()
|
|
var/list/values = list()
|
|
|
|
for (var/ghost_form in ghost_forms)
|
|
values[ghost_form] = icon('icons/mob/simple/mob.dmi', ghost_form)
|
|
|
|
return values
|
|
|
|
/datum/preference/choiced/ghost_form/create_default_value()
|
|
return "ghost"
|
|
|
|
/datum/preference/choiced/ghost_form/apply_to_client(client/client, value)
|
|
var/mob/dead/observer/ghost = client.mob
|
|
if (!istype(ghost))
|
|
return
|
|
|
|
if (!client.is_content_unlocked())
|
|
return
|
|
|
|
ghost.update_icon(ALL, value)
|
|
|
|
/datum/preference/choiced/ghost_form/compile_constant_data()
|
|
var/list/data = ..()
|
|
|
|
data[CHOICED_PREFERENCE_DISPLAY_NAMES] = ghost_forms
|
|
|
|
return data
|
|
|
|
/// Toggles the HUD for ghosts
|
|
/datum/preference/toggle/ghost_hud
|
|
savefile_key = "ghost_hud"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
|
|
/datum/preference/toggle/ghost_hud/apply_to_client(client/client, value)
|
|
if (isobserver(client?.mob))
|
|
client?.mob.hud_used?.show_hud()
|
|
|
|
/// Determines what ghosts orbiting look like to you.
|
|
/datum/preference/choiced/ghost_orbit
|
|
savefile_key = "ghost_orbit"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
|
|
/datum/preference/choiced/ghost_orbit/init_possible_values()
|
|
return list(
|
|
GHOST_ORBIT_CIRCLE,
|
|
GHOST_ORBIT_TRIANGLE,
|
|
GHOST_ORBIT_SQUARE,
|
|
GHOST_ORBIT_HEXAGON,
|
|
GHOST_ORBIT_PENTAGON,
|
|
)
|
|
|
|
/datum/preference/choiced/ghost_orbit/apply_to_client(client/client, value)
|
|
var/mob/dead/observer/ghost = client.mob
|
|
if (!istype(ghost))
|
|
return
|
|
|
|
if (!client.is_content_unlocked())
|
|
return
|
|
|
|
ghost.ghost_orbit = value
|
|
|
|
/// Determines how to show other ghosts
|
|
/datum/preference/choiced/ghost_others
|
|
savefile_key = "ghost_others"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
|
|
/datum/preference/choiced/ghost_others/init_possible_values()
|
|
return list(
|
|
GHOST_OTHERS_SIMPLE,
|
|
GHOST_OTHERS_DEFAULT_SPRITE,
|
|
GHOST_OTHERS_THEIR_SETTING,
|
|
)
|
|
|
|
/datum/preference/choiced/ghost_others/create_default_value()
|
|
return GHOST_OTHERS_DEFAULT_OPTION
|
|
|
|
/datum/preference/choiced/ghost_others/apply_to_client(client/client, value)
|
|
var/mob/dead/observer/ghost = client.mob
|
|
if (!istype(ghost))
|
|
return
|
|
|
|
ghost.update_sight()
|
|
|
|
/datum/preference/choiced/ghost_others/deserialize(input, datum/preferences/preferences)
|
|
// Old ghost preferences used to be 1/50/100.
|
|
// Whoever did that wasted an entire day of my time trying to get those sent
|
|
// properly, so I'm going to buck them.
|
|
if (isnum(input))
|
|
switch (input)
|
|
if (1)
|
|
input = GHOST_OTHERS_SIMPLE
|
|
if (50)
|
|
input = GHOST_OTHERS_DEFAULT_SPRITE
|
|
if (100)
|
|
input = GHOST_OTHERS_THEIR_SETTING
|
|
|
|
return ..(input, preferences)
|
|
|
|
/// Whether or not ghosts can examine things by clicking on them.
|
|
/datum/preference/toggle/inquisitive_ghost
|
|
savefile_key = "inquisitive_ghost"
|
|
savefile_identifier = PREFERENCE_PLAYER
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
|
|
/// When enabled, prevents any and all ghost role pop-ups.
|
|
/datum/preference/toggle/ghost_roles
|
|
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
|
|
savefile_key = "ghost_roles"
|
|
savefile_identifier = PREFERENCE_PLAYER
|