From: Professor Renderer Grizzleton Date: Tue, 27 May 2025 16:39:52 +0000 (-0400) Subject: Give cluwnes job icons (#37834) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=94fba22eee1dcafb3e7fc3df65e767f65c240f21;p=space-station-14.git Give cluwnes job icons (#37834) * Add Weh-pet * Add Weh-pet (again) * Change weh-pet size to Medium * Change weh-pet size to Medium (again) Probably should've looked into what "medium" meant in yaml * I may be stupid and misread how MIDIs worked. * Finish weh-pet sprites Weh! * Add weh-pet to rare maints loot table * Give cluwne sechud icon * Remove weh-pet related content from cluwne-id Why was it still THERE? * Revert "Add Weh-pet (again)" This reverts commit 8e135e520859ef94e693e27a86af1eed9576f9ab. * Fix whitespace issues in residual files * Update Resources/Textures/Interface/Misc/job_icons.rsi/meta.json Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * More whitespace fixing and credit adding * Resolve conflict in job_icons.rsi/meta.json * Fixing whitespace *again* --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 72332010e6..c4c5cc0aaf 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -782,6 +782,7 @@ - state: idcluwne - type: IdCard jobTitle: job-title-cluwne + jobIcon: JobIconCluwne - type: Unremoveable - type: entity diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 0abb86aeab..99857a3f47 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -205,6 +205,14 @@ state: Clown jobName: job-name-clown +- type: jobIcon + parent: JobIcon + id: JobIconCluwne + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Cluwne + jobName: job-name-cluwne + - type: jobIcon parent: JobIcon id: JobIconCaptain diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Cluwne.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Cluwne.png new file mode 100644 index 0000000000..2359c2bb4f Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Cluwne.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 108675c7ba..8dd3bacec6 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github)", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord)", "size": { "x": 8, "y": 8 @@ -79,6 +79,9 @@ { "name": "Clown" }, + { + "name": "Cluwne" + }, { "name": "Captain" },