Skip to content

Vox clothing #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ConsumoFurioso wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Vox clothing #619

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b28f378
Vox Rouma Uniform
ConsumoFurioso Mar 10, 2026
944982d
Readding Code to shiptest.dme
ConsumoFurioso Mar 10, 2026
f8c981f
Fix typo in include directive for pentest.dme
Ossa88 Mar 10, 2026
2b9ecf2
Icon state change
ConsumoFurioso Mar 10, 2026
4494161
Merge branch 'VoxClothing' of https://github.com/ConsumoFurioso/Pente…
ConsumoFurioso Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/modules/clothing/factions/srm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
item_state = "rouma_work"
icon = 'icons/obj/clothing/faction/srm/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi'
supports_variations = KEPORI_VARIATION
supports_variations = KEPORI_VARIATION | VOX_VARIATION
Copy link
Collaborator

@Constellado Constellado Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines of codes can be modularized easily, my RTG PR that is here is a good example! However, we do need to test if it works in game like this first, though! I think Ossa offered to help if the sprite doesn't show up correctly in game like you mentioned in discord.

Copy link
Collaborator

@Ossa88 Ossa88 Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will end up taking care of this once everything is working as I know the sprite might need adjustments so that it aligns correctly.

vox_override_icon = 'icons/mob/clothing/faction/srm/vox.dmi'

//////////////////
//Armored suits//
Expand Down
Binary file added icons/mob/clothing/faction/srm/vox.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion shiptest.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\screentip.dm"
#include "code\_onclick\hud\storage.dm"
#include "code\~PENTEST\~pentest.dme"
#inlcude "code\~PENTEST\~pentest.dme"

Check warning on line 339 in shiptest.dme

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0000: Error recovery had to skip to code/controllers/admin.dm:2:1

Check failure on line 339 in shiptest.dme

View workflow job for this annotation

GitHub Actions / Run Linters 

OD0001: Invalid token encountered while preprocessing: #inlcude (DM_Preproc_ParameterStringify)

Check failure on line 339 in shiptest.dme

View workflow job for this annotation

GitHub Actions / Run Linters 

got '"code\~PENTEST\~pentest.dme"', expected one of: newline, '/', identifier

Check failure on line 339 in shiptest.dme

View workflow job for this annotation

GitHub Actions / Run Linters 

unknown directive: #inlcude
Copy link
Collaborator

@Constellado Constellado Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#inlcude "code\~PENTEST\~pentest.dme"
#include "code\~PENTEST\~pentest.dme"

Found a typo, fixing!

#include "code\controllers\admin.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
Expand Down
Loading