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

Converts a bunch of items into using neck slot (#27474)

Browse Source 
* woe upon me

* update

* few changes

* critters

* critters

* THIS IS A CERTIFIED VOX CLASSIC

* removes comment from sql script

* i think i have a skill issue

* fuck

* TGUI Bundle Rebuild

* furcape

* attackby update

* cerefix

* buildstgui

* ajust size of loadout menu again

* tie layering toggle

* renames layer

* fucking map conflicts

* woe

* deconflict

* tgui

* conflicts again

* conflicts

* manual deconflict again

* oops

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* give this one more try

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* Update code/modules/clothing/neck/necklace.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>

* review

* scarffixforemerald

* tgui rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Bm0n
2025-01-02 22:47:50 +00:00
committed by GitHub
co-authored by Luc Bmon
parent 6f13d4432a
commit 6a63097109
60 changed files with 1058 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_accessories.dm
-97
View File
@@ -16,66 +16,6 @@
slot = ITEM_SLOT_ACCESSORY
sort_category = "Accessories"
/datum/gear/accessory/scarf
display_name = "Scarf"
path = /obj/item/clothing/accessory/scarf
/datum/gear/accessory/scarf/red
display_name = "Scarf, red"
path = /obj/item/clothing/accessory/scarf/red
/datum/gear/accessory/scarf/green
display_name = "Scarf, green"
path = /obj/item/clothing/accessory/scarf/green
/datum/gear/accessory/scarf/darkblue
display_name = "Scarf, dark blue"
path = /obj/item/clothing/accessory/scarf/darkblue
/datum/gear/accessory/scarf/purple
display_name = "Scarf, purple"
path = /obj/item/clothing/accessory/scarf/purple
/datum/gear/accessory/scarf/yellow
display_name = "Scarf, yellow"
path = /obj/item/clothing/accessory/scarf/yellow
/datum/gear/accessory/scarf/orange
display_name = "Scarf, orange"
path = /obj/item/clothing/accessory/scarf/orange
/datum/gear/accessory/scarf/lightblue
display_name = "Scarf, light blue"
path = /obj/item/clothing/accessory/scarf/lightblue
/datum/gear/accessory/scarf/white
display_name = "Scarf, white"
path = /obj/item/clothing/accessory/scarf/white
/datum/gear/accessory/scarf/black
display_name = "Scarf, black"
path = /obj/item/clothing/accessory/scarf/black
/datum/gear/accessory/scarf/zebra
display_name = "Scarf, zebra"
path = /obj/item/clothing/accessory/scarf/zebra
/datum/gear/accessory/scarf/christmas
display_name = "Scarf, christmas"
path = /obj/item/clothing/accessory/scarf/christmas
/datum/gear/accessory/scarf/stripedred
display_name = "Scarf, striped red"
path = /obj/item/clothing/accessory/stripedredscarf
/datum/gear/accessory/scarf/stripedgreen
display_name = "Scarf, striped green"
path = /obj/item/clothing/accessory/stripedgreenscarf
/datum/gear/accessory/scarf/stripedblue
display_name = "Scarf, striped blue"
path = /obj/item/clothing/accessory/stripedbluescarf
/datum/gear/accessory/holobadge
display_name = "Holobadge, pin"
path = /obj/item/clothing/accessory/holobadge
@@ -86,27 +26,6 @@
path = /obj/item/clothing/accessory/holobadge/cord
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/accessory/tieblue
display_name = "Tie, blue"
path = /obj/item/clothing/accessory/blue
/datum/gear/accessory/tiered
display_name = "Tie, red"
path = /obj/item/clothing/accessory/red
/datum/gear/accessory/tieblack
display_name = "Tie, black"
path = /obj/item/clothing/accessory/black
/datum/gear/accessory/tiehorrible
display_name = "Tie, vomit green"
path = /obj/item/clothing/accessory/horrible
/datum/gear/accessory/stethoscope
display_name = "Stethoscope"
path = /obj/item/clothing/accessory/stethoscope
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic")
/datum/gear/accessory/cowboyshirt
display_name = "Cowboy shirt, black"
path = /obj/item/clothing/accessory/cowboyshirt
@@ -147,22 +66,6 @@
display_name = "Cowboy shirt, short sleeved navy"
path = /obj/item/clothing/accessory/cowboyshirt/navy/short_sleeved
/datum/gear/accessory/locket/silver
display_name = "Silver locket"
path = /obj/item/clothing/accessory/necklace/locket/silver
/datum/gear/accessory/locket
display_name = "Gold locket"
path = /obj/item/clothing/accessory/necklace/locket
/datum/gear/accessory/necklace/long
display_name = "Large necklace"
path = /obj/item/clothing/accessory/necklace/long
/datum/gear/accessory/necklace
display_name = "Simple necklace"
path = /obj/item/clothing/accessory/necklace
/datum/gear/accessory/corset
display_name = "Corset, black"
path = /obj/item/clothing/accessory/corset
code/modules/client/preference/loadout/loadout_donor.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/datum/gear/donor/furcape
display_name = "Fur Cape"
path = /obj/item/clothing/suit/furcape
path = /obj/item/clothing/neck/cloak/furcape
/datum/gear/donor/furcoat
display_name = "Fur Coat"
code/modules/client/preference/loadout/loadout_neck.dm
+206
View File
@@ -0,0 +1,206 @@
/*
######################################################################################
## ##
## IMPORTANT README ##
## ##
## Changing any /datum/gear typepaths --WILL-- break people's loadouts. ##
## The typepaths are stored directly in the `characters.gear` column of the DB. ##
## Please inform the server host if you wish to modify any of these. ##
## ##
######################################################################################
*/
/datum/gear/neck
main_typepath = /datum/gear/neck
slot = ITEM_SLOT_NECK
sort_category = "Neck"
/datum/gear/neck/tie
display_name = "Tie, blue"
path = /obj/item/clothing/neck/tie/blue
/datum/gear/neck/tie/red
display_name = "Tie, red"
path = /obj/item/clothing/neck/tie/red
/datum/gear/neck/tie/black
display_name = "Tie, black"
path = /obj/item/clothing/neck/tie/black
/datum/gear/neck/tie/horrible
display_name = "Tie, vomit green"
path = /obj/item/clothing/neck/tie/horrible
/datum/gear/neck/scarf
display_name = "Scarf, red"
path = /obj/item/clothing/neck/scarf/red
/datum/gear/neck/scarf/green
display_name = "Scarf, green"
path = /obj/item/clothing/neck/scarf/green
/datum/gear/neck/scarf/darkblue
display_name = "Scarf, dark blue"
path = /obj/item/clothing/neck/scarf/darkblue
/datum/gear/neck/scarf/purple
display_name = "Scarf, purple"
path = /obj/item/clothing/neck/scarf/purple
/datum/gear/neck/scarf/yellow
display_name = "Scarf, yellow"
path = /obj/item/clothing/neck/scarf/yellow
/datum/gear/neck/scarf/orange
display_name = "Scarf, orange"
path = /obj/item/clothing/neck/scarf/orange
/datum/gear/neck/scarf/lightblue
display_name = "Scarf, light blue"
path = /obj/item/clothing/neck/scarf/lightblue
/datum/gear/neck/scarf/white
display_name = "Scarf, white"
path = /obj/item/clothing/neck/scarf/white
/datum/gear/neck/scarf/black
display_name = "Scarf, black"
path = /obj/item/clothing/neck/scarf/black
/datum/gear/neck/scarf/zebra
display_name = "Scarf, zebra"
path = /obj/item/clothing/neck/scarf/zebra
/datum/gear/neck/scarf/christmas
display_name = "Scarf, christmas"
path = /obj/item/clothing/neck/scarf/christmas
/datum/gear/neck/scarf/stripedred
display_name = "Scarf, striped red"
path = /obj/item/clothing/neck/scarf/stripedred
/datum/gear/neck/scarf/stripedgreen
display_name = "Scarf, striped green"
path = /obj/item/clothing/neck/scarf/stripedgreen
/datum/gear/neck/scarf/stripedblue
display_name = "Scarf, striped blue"
path = /obj/item/clothing/neck/scarf/stripedblue
/datum/gear/neck/stethoscope
display_name = "Stethoscope"
path = /obj/item/clothing/neck/stethoscope
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic")
/datum/gear/neck/locket
display_name = "Gold locket"
path = /obj/item/clothing/neck/necklace/locket
/datum/gear/neck/locket/silver
display_name = "Silver locket"
path = /obj/item/clothing/neck/necklace/locket/silver
/datum/gear/neck/necklace
display_name = "Simple necklace"
path = /obj/item/clothing/neck/necklace
/datum/gear/neck/necklace/long
display_name = "Large necklace"
path = /obj/item/clothing/neck/necklace/long
//Cloaks and mantles
/datum/gear/neck/cloak
display_name = "Cloak"
path = /obj/item/clothing/neck/cloak
/datum/gear/neck/cloak/job
main_typepath = /datum/gear/neck/cloak/job
subtype_selection_cost = FALSE
/datum/gear/neck/cloak/job/captain
display_name = "Cloak, captain"
path = /obj/item/clothing/neck/cloak/captain
allowed_roles = list("Captain")
/datum/gear/neck/cloak/job/hos
display_name = "Cloak, head of security"
path = /obj/item/clothing/neck/cloak/head_of_security
allowed_roles = list("Head of Security")
/datum/gear/neck/cloak/job/hop
display_name = "Cloak, head of personnel"
path = /obj/item/clothing/neck/cloak/head_of_personnel
allowed_roles = list("Head of Personnel")
/datum/gear/neck/cloak/job/rd
display_name = "Cloak, research director"
path = /obj/item/clothing/neck/cloak/research_director
allowed_roles = list("Research Director")
/datum/gear/neck/cloak/job/ce
display_name = "Cloak, chief engineer"
path = /obj/item/clothing/neck/cloak/chief_engineer
allowed_roles = list("Chief Engineer")
/datum/gear/neck/cloak/job/cmo
display_name = "Cloak, chief medical officer"
path = /obj/item/clothing/neck/cloak/chief_medical_officer
allowed_roles = list("Chief Medical Officer")
/datum/gear/neck/cloak/job/qm
display_name = "Cloak, quartermaster"
path = /obj/item/clothing/neck/cloak/quartermaster
allowed_roles = list("Quartermaster")
/datum/gear/neck/old_scarf
display_name = "Old scarf"
path = /obj/item/clothing/neck/cloak/old
/datum/gear/neck/regal_shawl
display_name = "Regal shawl"
path = /obj/item/clothing/neck/cloak/regal
/datum/gear/neck/mantle
display_name = "Mantle"
path = /obj/item/clothing/neck/cloak/mantle
/datum/gear/neck/mantle/job
main_typepath = /datum/gear/neck/mantle/job
subtype_selection_cost = FALSE
/datum/gear/neck/mantle/job/captain
display_name = "Mantle, captain"
path = /obj/item/clothing/neck/cloak/captain_mantle
allowed_roles = list("Captain")
/datum/gear/neck/mantle/job/hos
display_name = "Mantle, head of security"
path = /obj/item/clothing/neck/cloak/hos_mantle
allowed_roles = list("Head of Security")
/datum/gear/neck/mantle/job/hop
display_name = "Mantle, head of personnel"
path = /obj/item/clothing/neck/cloak/hop_mantle
allowed_roles = list("Head of Personnel")
/datum/gear/neck/mantle/job/rd
display_name = "Mantle, research director"
path = /obj/item/clothing/neck/cloak/rd_mantle
allowed_roles = list("Research Director")
/datum/gear/neck/mantle/job/ce
display_name = "Mantle, chief engineer"
path = /obj/item/clothing/neck/cloak/ce_mantle
allowed_roles = list("Chief Engineer")
/datum/gear/neck/mantle/job/cmo
display_name = "Mantle, chief medical officer"
path = /obj/item/clothing/neck/cloak/cmo_mantle
allowed_roles = list("Chief Medical Officer")
/datum/gear/neck/mantle/job/qm
display_name = "Mantle, quartermaster"
path = /obj/item/clothing/neck/cloak/qm_mantle
allowed_roles = list("Quartermaster")
code/modules/client/preference/loadout/loadout_suit.dm
-47
View File
@@ -252,53 +252,6 @@
display_name = "Suit jacket, purple"
path = /obj/item/clothing/suit/storage/iaa/purplejacket
//Mantles!
/datum/gear/suit/mantle
display_name = "Mantle"
path = /obj/item/clothing/suit/mantle
/datum/gear/suit/old_scarf
display_name = "Old scarf"
path = /obj/item/clothing/suit/mantle/old
/datum/gear/suit/regal_shawl
display_name = "Regal shawl"
path = /obj/item/clothing/suit/mantle/regal
/datum/gear/suit/mantle/job
main_typepath = /datum/gear/suit/mantle/job
subtype_selection_cost = FALSE
/datum/gear/suit/mantle/job/captain
display_name = "Mantle, captain"
path = /obj/item/clothing/suit/mantle/armor/captain
allowed_roles = list("Captain")
/datum/gear/suit/mantle/job/ce
display_name = "Mantle, chief engineer"
path = /obj/item/clothing/suit/mantle/chief_engineer
allowed_roles = list("Chief Engineer")
/datum/gear/suit/mantle/job/cmo
display_name = "Mantle, chief medical officer"
path = /obj/item/clothing/suit/mantle/labcoat/chief_medical_officer
allowed_roles = list("Chief Medical Officer")
/datum/gear/suit/mantle/job/hos
display_name = "Mantle, head of security"
path = /obj/item/clothing/suit/mantle/armor
allowed_roles = list("Head of Security")
/datum/gear/suit/mantle/job/hop
display_name = "Mantle, head of personnel"
path = /obj/item/clothing/suit/mantle/armor/hop
allowed_roles = list("Head of Personnel")
/datum/gear/suit/mantle/job/rd
display_name = "Mantle, research director"
path = /obj/item/clothing/suit/mantle/labcoat
allowed_roles = list("Research Director")
//Robes!
/datum/gear/suit/witch