cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Turtlenecks for Various Command Members. (#29948)

Browse Source 
* add sprites

* obj

* CMO turtlenecks

* turtle code

* CODE

* everythig

* fixes

* HOP FIX

* super fix ultra fix look at this fucking fix

* done

* config fix

* tiny fix

* test

* test 2

* desc

* hop desc

* Move all the non-weapons out of code/game/objects/weapons (#29820)

* Update bartender mob and obj sprites for relevant species (#29889)

* Update bartender mob and obj sprites for relevant species

* Add bartender uniform rolldowns, inhands. Minor color fixes.

* Revert "Update bartender mob and obj sprites for relevant species (#29889)"

This reverts commit afc4389871.

NVM

---------

Signed-off-by: Seren Highwater.  <102489377+SerenHighwater@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
This commit is contained in:
Seren Highwater.
2025-08-13 20:45:12 +00:00
committed by GitHub
co-authored by Charlie Nolan Alan
parent c22e1ceb6f
commit 207695cbda
51 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_uniform.dm
+46
View File
@@ -20,6 +20,12 @@
/datum/gear/uniform/suit
main_typepath = /datum/gear/uniform/suit
/datum/gear/uniform/turtleneck
main_typepath = /datum/gear/uniform/turtleneck
/datum/gear/uniform/turtleneck/job
main_typepath = /datum/gear/uniform/turtleneck/job
//there's a lot more colors than I thought there were @_@
/datum/gear/uniform/suit/jumpsuitblack
@@ -245,6 +251,11 @@
path = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/turtleneck/job/ce
display_name = "Turtleneck, ce"
path = /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck
allowed_roles = list("Chief Engineer")
//Research
/datum/gear/uniform/skirt/job/sci
display_name = "Skirt, scientist"
@@ -261,6 +272,12 @@
path = /obj/item/clothing/under/rank/rnd/rd/skirt
allowed_roles = list("Research Director")
/datum/gear/uniform/turtleneck/job/rd
display_name = "Turtleneck, rd"
path = /obj/item/clothing/under/rank/rnd/rd/turtleneck
allowed_roles = list("Research Director")
//Medical
/datum/gear/uniform/skirt/job/chem
display_name = "Skirt, chemist"
@@ -287,6 +304,11 @@
path = /obj/item/clothing/under/rank/medical/cmo/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/turtleneck/job/cmo
display_name = "Skirt, cmo"
path = /obj/item/clothing/under/rank/medical/cmo/turtleneck
allowed_roles = list("Chief Medical Officer")
//Supply
/datum/gear/uniform/skirt/job/cargo
display_name = "Skirt, cargo"
@@ -308,12 +330,22 @@
path = /obj/item/clothing/under/rank/cargo/qm/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/turtleneck/job/qm
display_name = "Turtleneck, quartermaster"
path = /obj/item/clothing/under/rank/cargo/qm/turtleneck
allowed_roles = list("Quartermaster")
//Security
/datum/gear/uniform/skirt/job/warden
display_name = "Skirt, warden"
path = /obj/item/clothing/under/rank/security/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/turtleneck/job/warden
display_name = "Turtleneck, warden"
path = /obj/item/clothing/under/rank/security/warden/turtleneck
allowed_roles = list("Warden")
/datum/gear/uniform/skirt/job/security
display_name = "Skirt, security"
path = /obj/item/clothing/under/rank/security/officer/skirt
@@ -324,6 +356,11 @@
path = /obj/item/clothing/under/rank/security/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/turtleneck/job/head_of_security
display_name = "Turtleneck, hos"
path = /obj/item/clothing/under/rank/security/head_of_security/turtleneck
allowed_roles = list("Head of Security")
//Service
/datum/gear/uniform/skirt/job/clown
display_name = "Skirt, clown"
@@ -345,6 +382,11 @@
path = /obj/item/clothing/under/rank/civilian/hop/skirt
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/turtleneck/job/head_of_personnel
display_name = "Turtleneck, hop"
path = /obj/item/clothing/under/rank/civilian/hop/turtleneck
allowed_roles = list("Head of Personnel")
//Command and dignitary
/datum/gear/uniform/skirt/captain
display_name = "Skirt, captain"
@@ -366,6 +408,10 @@
path = /obj/item/clothing/under/rank/procedure/blueshield/skirt
allowed_roles = list("Blueshield")
/datum/gear/uniform/turtleneck/job/blueshield
display_name = "Turtleneck, blueshield"
path = /obj/item/clothing/under/rank/procedure/blueshield/turtleneck
allowed_roles = list("Blueshield")
/datum/gear/uniform/medical
main_typepath = /datum/gear/uniform/medical
code/modules/clothing/under/jobs/cargo.dm
+7
View File
@@ -47,6 +47,13 @@
item_state = "qm_whimsy"
item_color = "qm_whimsy"
/obj/item/clothing/under/rank/cargo/qm/turtleneck
name = "quartermaster's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold cargo bay. Due to budget cuts, the material does not offer any external protection."
icon_state = "qm_turtle"
item_state = "qm_turtle"
item_color = "qm_turtle"
/obj/item/clothing/under/rank/cargo/tech
name = "cargo technician's jumpsuit"
desc = "A standard issue jumpsuit for cargo technicians. Snazzy!"
code/modules/clothing/under/jobs/civilian.dm
+7
View File
@@ -49,6 +49,13 @@
item_state = "oldman"
item_color = "oldman"
/obj/item/clothing/under/rank/civilian/hop/turtleneck
name = "head of personnel's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold office. Due to budget cuts, the material does not offer any external protection."
icon_state = "hop_turtle"
item_state = "hop_turtle"
item_color = "hop_turtle"
/obj/item/clothing/under/rank/civilian/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
code/modules/clothing/under/jobs/engineering_jumpsuits.dm
+7
View File
@@ -27,6 +27,13 @@
dyeable = TRUE
dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck
name = "chief engineer's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold engineering lobby. Due to budget cuts, the material does not offer any external protection."
icon_state = "ce_turtle"
item_state = "ce_turtle"
item_color = "ce_turtle"
/obj/item/clothing/under/rank/engineering/atmospheric_technician
name = "atmospheric technician's jumpsuit"
desc = "It's a jumpsuit worn by atmospheric technicians."
code/modules/clothing/under/jobs/medical_jumpsuits.dm
+8
View File
@@ -26,6 +26,14 @@
item_color = "cmo_skirt"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/medical/cmo/turtleneck
name = "chief medical officer's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold medical bay. Due to budget cuts, the material does not offer any external protection."
icon_state = "cmo_turtle"
item_state = "cmo_turtle"
item_color = "cmo_turtle"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
/obj/item/clothing/under/rank/medical/doctor
name = "medical doctor's jumpsuit"
desc = "It's made of a special fiber that provides protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
code/modules/clothing/under/jobs/procedure.dm
+7
View File
@@ -84,6 +84,13 @@
item_color = "blueshield_formal"
displays_id = FALSE
/obj/item/clothing/under/rank/procedure/blueshield/turtleneck
name = "blueshield's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold bridge. Due to budget cuts, the material does not offer any external protection."
icon_state = "bs_turtle"
item_state = "bs_turtle"
item_color = "bs_turtle"
/obj/item/clothing/under/rank/procedure/iaa
name = "Internal Affairs uniform"
desc = "The plain, professional attire of an Internal Affairs Agent. The collar is <i>immaculately</i> starched."
code/modules/clothing/under/jobs/rnd.dm
+6
View File
@@ -32,6 +32,12 @@
dyeable = TRUE
dyeing_key = DYE_REGISTRY_JUMPSKIRT
/obj/item/clothing/under/rank/rnd/rd/turtleneck
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold research lobby. Due to budget cuts, the material does not offer any external protection."
icon_state = "rd_turtle"
item_state = "rd_turtle"
item_color = "rd_turtle"
/obj/item/clothing/under/rank/rnd/scientist
name = "scientist's jumpsuit"
desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a scientist."
code/modules/clothing/under/jobs/security_jumpsuits.dm
+27
View File
@@ -28,6 +28,20 @@
item_state = "warden_corporate_skirt"
item_color = "warden_corporate_skirt"
/obj/item/clothing/under/rank/security/warden/turtleneck
name = "warden's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer warm in a cold prison. Due to budget cuts, the material does not offer any external protection."
icon_state = "ward_turtle"
item_state = "ward_turtle"
item_color = "ward_turtle"
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/security.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi'
)
/obj/item/clothing/under/rank/security/officer
name = "security officer's jumpsuit"
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
@@ -167,3 +181,16 @@
icon_state = "hos_formal"
item_color = "hos_formal"
/obj/item/clothing/under/rank/security/head_of_security/turtleneck
name = "head of security's turtleneck"
desc = "A fancy turtleneck designed to keep the wearer cozy in a cold security lobby. Due to budget cuts, the material does not offer any external protection."
icon_state = "hos_turtle"
item_state = "hos_turtle"
item_color = "hos_turtle"
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/security.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/security.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/security.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/security.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/security.dmi'
)