cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dignitary drip - Magistrate, NT Rep, Blueshield (#20438)

Browse Source 
* dignitary, human, items, spawning

* garment bag update

* dignitary icons

* ntrep cap

* gloves and hat fix

* dignitary icons part 2 and misc code

* minor stuff

* hat fix from updates also drask and grey suit slot

* minor description discrepancy

* cane resprite
This commit is contained in:
Christasmurf
2023-03-02 09:15:35 +00:00
committed by GitHub
parent 261d7f8e17
commit 330180c83e
31 changed files with 117 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_uniform.dm
+5
View File
@@ -203,6 +203,11 @@
path = /obj/item/clothing/under/rank/security/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/skirt/job/magistrate
display_name = "Skirt, magistrate"
path = /obj/item/clothing/under/rank/centcom/magistrate/skirt
allowed_roles = list("Magistrate")
/datum/gear/uniform/skirt/job/ntrep
display_name = "Skirt, nt rep"
path = /obj/item/clothing/under/rank/centcom/representative/skirt
code/modules/clothing/gloves/color.dm
+6
View File
@@ -235,6 +235,12 @@
icon_state = "white"
item_state = "wgloves"
item_color="mime"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
)
/obj/item/clothing/gloves/color/white/redcoat
item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
code/modules/clothing/gloves/misc_gloves.dm
+6
View File
@@ -45,6 +45,12 @@
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 200, ACID = 50)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi',
)
/obj/item/clothing/gloves/bracer
name = "bone bracers"
code/modules/clothing/head/job_hats.dm
+6
View File
@@ -63,6 +63,12 @@
desc = "A cap issued to Nanotrasen Representatives."
icon_state = "ntrep"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
"Grey" = 'icons/mob/clothing/species/grey/head.dmi',
)
//Chaplain
/obj/item/clothing/head/hooded/chaplain_hood
code/modules/clothing/suits/job_suits.dm
+24 -2
View File
@@ -180,7 +180,10 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
)
//Engineering
@@ -287,9 +290,28 @@
adjust_flavour = "unbutton"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
)
/obj/item/clothing/suit/magirobe
name = "magistrate's robe"
desc = "An opulent robe that commands authority. Issued only to licensed magistrates."
icon_state = "magirobe"
item_state = "magirobe"
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
allowed = list(/obj/item/storage/fancy/cigarettes, /obj/item/stack/spacecash, /obj/item/flash, /obj/item/gavelhammer)
flags_inv = HIDEJUMPSUIT
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi',
"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
)
//Medical
/obj/item/clothing/suit/storage/fr_jacket
name = "first responder jacket"
code/modules/clothing/suits/misc_suits.dm
+3 -3
View File
@@ -97,11 +97,11 @@
/obj/item/clothing/suit/judgerobe
name = "judge's robe"
desc = "This robe commands authority."
name = "judge's robe costume"
desc = "A fancy costume giving off an aura of authority."
icon_state = "judge"
item_state = "judge"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS | ARMS
allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/stack/spacecash)
flags_inv = HIDEJUMPSUIT
code/modules/clothing/under/centcom.dm
+57 -33
View File
@@ -10,7 +10,8 @@
"Human" = 'icons/mob/clothing/under/centcom.dmi',
"Vox" = 'icons/mob/clothing/species/vox/under/centcom.dmi',
"Drask" = 'icons/mob/clothing/species/drask/under/centcom.dmi',
"Grey" = 'icons/mob/clothing/species/grey/under/centcom.dmi'
"Grey" = 'icons/mob/clothing/species/grey/under/centcom.dmi',
"Kidan" = 'icons/mob/clothing/species/kidan/under/centcom.dmi'
)
/obj/item/clothing/under/rank/centcom/sensor
@@ -56,35 +57,56 @@
desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection."
/obj/item/clothing/under/rank/centcom/representative
name = "formal Nanotrasen Representative's uniform"
desc = "Gold trim on space-black cloth, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
displays_id = FALSE
/obj/item/clothing/under/rank/centcom/representative/Initialize(mapload)
. = ..()
desc = "Gold trim on space-black cloth, this uniform bears [station_name()] on the left shoulder."
name = "\improper Nanotrasen representative's uniform"
desc = "Fine black cotton pants and white shirt with blue and gold trim."
icon_state = "ntrep"
item_state = "ntrep"
item_color = "ntrep"
/obj/item/clothing/under/rank/centcom/representative/skirt
desc = "A silky smooth black and gold representative uniform with blue markings."
name = "representative skirt"
icon_state = "ntrepf"
item_state = "ntrepf"
item_color = "ntrepf"
name = "\improper Nanotrasen representative's skirt"
desc = "A silky black skirt and white shirt with blue and gold trim."
icon_state = "ntrep_skirt"
item_state = "ntrep_skirt"
item_color = "ntrep_skirt"
/obj/item/clothing/under/rank/centcom/magistrate
name = "formal magistrate's uniform"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
/obj/item/clothing/under/rank/centcom/representative/formal
name = "formal Nanotrasen representative's uniform"
desc = "A formal black suit with gold trim and a blue tie, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
icon_state = "ntrep_formal"
item_state = "ntrep_formal"
item_color = "ntrep_formal"
displays_id = FALSE
/obj/item/clothing/under/rank/centcom/magistrate/Initialize(mapload)
/obj/item/clothing/under/rank/centcom/representative/formal/Initialize(mapload)
. = ..()
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder."
desc = "A formal black suit with gold trim and a blue tie, this uniform bears [station_name()] on the left shoulder."
/obj/item/clothing/under/rank/centcom/magistrate
name = "magistrate's uniform"
desc = "Fine black cotton pants and white shirt with a black tie and gold trim."
icon_state = "magistrate"
item_state = "magistrate"
item_color = "magistrate"
/obj/item/clothing/under/rank/centcom/magistrate/skirt
name = "magistrate's skirt"
desc = "A silky black skirt and white shirt with a black tie and gold trim."
icon_state = "magistrate_skirt"
item_state = "magistrate_skirt"
item_color = "magistrate_skirt"
/obj/item/clothing/under/rank/centcom/magistrate/formal
name = "formal magistrate's uniform"
desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
icon_state = "magistrate_formal"
item_state = "magistrate_formal"
item_color = "magistrate_formal"
displays_id = FALSE
/obj/item/clothing/under/rank/centcom/magistrate/formal/Initialize(mapload)
. = ..()
desc = "A formal black suit with gold trim and a snazzy red tie, this uniform displays the rank of \"Magistrate\" and bears [station_name()] on the left shoulder."
/obj/item/clothing/under/rank/centcom/diplomatic
name = "\improper Nanotrasen diplomatic uniform"
@@ -96,23 +118,25 @@
/obj/item/clothing/under/rank/centcom/blueshield
name = "blueshield's uniform"
desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants, all made out of a sturdy material. Blueshield standard issue."
desc = "A short-sleeved black uniform, paired with grey armored cargo pants, all made out of a sturdy material. Blueshield standard issue."
icon_state = "blueshield"
item_state = "bl_suit"
item_state = "blueshield"
item_color = "blueshield"
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20)
/obj/item/clothing/under/rank/centcom/blueshield/skirt
name = "blueshield's skirt"
desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield."
icon_state = "blueshieldf"
item_state = "blueshieldf"
item_color = "blueshieldf"
icon_state = "blueshield_skirt"
item_state = "blueshield_skirt"
item_color = "blueshield_skirt"
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20)
/obj/item/clothing/under/rank/centcom/blueshield/formal
name = "formal blueshield's uniform"
desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection."
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
desc = "A formal black suit with blue trim and tie, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection."
icon_state = "blueshield_formal"
item_state = "blueshield_formal"
item_color = "blueshield_formal"
armor = list(MELEE = 5, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 20, ACID = 20)
displays_id = FALSE
code/modules/clothing/under/jobs/civilian.dm
-7
View File
@@ -137,13 +137,6 @@
item_state = "internalaffairs"
item_color = "internalaffairs"
/obj/item/clothing/under/rank/civilian/dress_shirt
desc = "A well-ironed dress shirt and matching set of black pants."
name = "dress shirt"
icon_state = "internalaffairs"
item_state = "internalaffairs"
item_color = "internalaffairs"
/obj/item/clothing/under/rank/civilian/lawyer
name = "lawyer suit"
desc = "Slick threads."