Skip to content
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.

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

Lucky's misc fixes 1 #1230

Merged
merged 9 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 4 additions & 0 deletions Coder Build.bat
SpaceCat404 marked this conversation as resolved.
Show resolved Hide resolved
SpaceCat404 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
call "%~dp0\tools\build\build.bat" %*

pause
62 changes: 62 additions & 0 deletions modular_splurt/code/modules/clothing/under/jobs/centcom.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/obj/item/clothing/under/rank/centcom
name = "centcom base uniform"
desc = "Shouldn't be seing this, and not just cause it's CC's!"
icon = 'modular_splurt/icons/obj/clothing/centcom.dmi'
mob_overlay_icon = 'modular_splurt/icons/mob/clothing/centcom.dmi'
icon_state = "debug"
item_state = "debug"

// Actual CC uniforms

/obj/item/clothing/under/rank/centcom/highranking
name = "high ranking centcom officer jumpsuit"
desc = "Oh shit, boss is here."
icon_state = "centcom"
item_state = "centcom"
can_adjust = TRUE

/obj/item/clothing/under/rank/centcom/highrankingfem
name = "high ranking centcom officer jumpskirt"
desc = "Oh shit, boss is here."
icon_state = "centcom_skirt"
item_state = "centcom_skirt"
can_adjust = TRUE

/obj/item/clothing/under/rank/centcom/officer
name = "centcom officer jumpsuit"
desc = "Lean, Green and Mean. Smells of self importance."
icon_state = "official"
item_state = "official"
can_adjust = TRUE

/obj/item/clothing/under/rank/centcom/sweater
name = "high ranking centcom officer sweater"
desc = "Favored by a certain bridge \"advisor\"."
icon_state = "officer"
item_state = "officer"
can_adjust = TRUE

/obj/item/clothing/under/rank/centcom/sweaterfem
name = "high ranking centcom officer sweaterskirt"
desc = "Favored by a certain femboy bride \"advisor\"."
icon_state = "officer_skirt"
item_state = "officer_skirt"
can_adjust = TRUE

/obj/item/clothing/under/rank/centcom/intern
name = "centcom intern jumpsuit"
desc = "Cheap and mass produced, very itchy."
icon_state = "intern"
item_state = "intern"

/obj/item/clothing/under/rank/centcom/tactical
name = "tactical centcom uniform"
desc = "No technorussian."
icon_state = "military"
item_state = "military"

/obj/item/clothing/under/rank/centcom/tacticalengi
name = "tactical engie centcom uniform"
desc = "\"I solve practical problems.\""
icon_state = "military_eng"
item_state = "military_eng"
9 changes: 9 additions & 0 deletions modular_splurt/code/modules/mob/living/emotes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1627,3 +1627,12 @@ To add randomization to your emote, copy and paste this line of code:
emote_cooldown = 4 SECONDS
vary = FALSE
volume = 30

/datum/emote/sound/human/squirm
key = "squirm"
key_third_person = "squirm"
name = "squirm"
message = "squirms in place!"
message_mime = "squirms in place!"
emote_type = EMOTE_VISIBLE
emote_cooldown = 0.8 SECONDS
Binary file added modular_splurt/icons/mob/clothing/centcom.dmi
Binary file not shown.
Binary file added modular_splurt/icons/obj/clothing/centcom.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4888,6 +4888,7 @@
#include "modular_splurt\code\modules\clothing\under\accessories.dm"
#include "modular_splurt\code\modules\clothing\under\miscellaneous.dm"
#include "modular_splurt\code\modules\clothing\under\shorts.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\centcom.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\command.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\engineering.dm"
#include "modular_splurt\code\modules\clothing\under\jobs\security.dm"
Expand Down