-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Datumizes pAI screen images (#89208)
This PR changes pAI screen images (previously called "emotion icon" or "card overlay") to be datums. In doing so, I made some changes in how screen images are handled: * A screen image's name and icon state are separate now, whereas before the name determined the icon state used. * Something useful for downstreams: The icon file that a screen image pulls from default's to tg's icon file for pAI screen images, but can be overridden if you don't want to put the new screen image in the same file. * The FA icon for each screen image is now selected in the datum, rather than as part of a constant in some far-off TS file. Additionally, the codebase previously used inconsistent terminology to refer to these - "card overlay" in one place, "emotion icon" in another, "image" somewhere else... Now, all of them are called "screen image" or some variant thereof. "Screen image" is more accurate to what it is anyways, since it doesn't need to be a face (although 99% of the time, it will be). One last thing: The new datum is in its own directory, all by its lonesome. If you're wondering why I don't just move it out and put it next to the rest of the pAI module, it's because I plan to datumize some other pAI stuff (in particular, software and holochassis) in a future PR. (Though I'll admit, I'm not sure of the current folder location.) Datumizes some items that really should've been datums in the first place. :cl: MichiRecRoom refactor: Datumized pAI card screen images /:cl: --------- Co-authored-by: SyncIt21 <[email protected]>
- Loading branch information
1 parent
8ca46b6
commit b2c4340
Showing
9 changed files
with
84 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
// Datums describing an icon that is overlaid on a pAI card, to make its screen show something. The | ||
// player can select between any of these at any time. These are usually faces, but can | ||
// realistically be anything (similar to an AI's display). | ||
|
||
/datum/pai_screen_image | ||
// The name to show in the radial menu. | ||
var/name | ||
// The icon and icon state that is applied to the pAI device when this screen image is selected. | ||
var/icon/icon = 'icons/obj/aicards.dmi' | ||
var/icon_state | ||
// The FontAwesome icon to use next to the "Display" button in the pAI's tgui interface window. | ||
var/interface_icon | ||
|
||
/datum/pai_screen_image/angry | ||
name = "Angry" | ||
icon_state = "pai-angry" | ||
interface_icon = "angry" | ||
|
||
/datum/pai_screen_image/cat | ||
name = "Cat" | ||
icon_state = "pai-cat" | ||
interface_icon = "cat" | ||
|
||
/datum/pai_screen_image/extremely_happy | ||
name = "Extremely Happy" | ||
icon_state = "pai-extremely-happy" | ||
interface_icon = "grin-beam" | ||
|
||
/datum/pai_screen_image/face | ||
name = "Face" | ||
icon_state = "pai-face" | ||
interface_icon = "grin-alt" | ||
|
||
/datum/pai_screen_image/happy | ||
name = "Happy" | ||
icon_state = "pai-happy" | ||
interface_icon = "smile" | ||
|
||
/datum/pai_screen_image/laugh | ||
name = "Laugh" | ||
icon_state = "pai-laugh" | ||
interface_icon = "grin-tears" | ||
|
||
/datum/pai_screen_image/neutral | ||
name = "Neutral" | ||
icon_state = "pai-null" | ||
interface_icon = "meh" | ||
|
||
/datum/pai_screen_image/off | ||
name = "None" | ||
icon_state = "pai-off" | ||
interface_icon = "meh-blank" | ||
|
||
/datum/pai_screen_image/sad | ||
name = "Sad" | ||
icon_state = "pai-sad" | ||
interface_icon = "sad-cry" | ||
|
||
/datum/pai_screen_image/sunglasses | ||
name = "Sunglasses" | ||
icon_state = "pai-sunglasses" | ||
interface_icon = "sun" | ||
|
||
/datum/pai_screen_image/what | ||
name = "What" | ||
icon_state = "pai-what" | ||
interface_icon = "frown-open" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters