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

CC clothing armor buff + description and name changes (#14803)

Browse Source 
* CC clothing armor buff + description and name changes

* Small change in blueshield's uniform description

* NTR's hat name and description change

* Fixed spacing issues with "energy"
This commit is contained in:
E-MonaRhg
2020-11-07 16:51:13 -05:00
committed by GitHub
parent 6a7456ae1f
commit 68afb726b3
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/jobs.dm
+2 -2
View File
@@ -37,8 +37,8 @@
//Nanotrasen Representative
/obj/item/clothing/head/ntrep
name = "Nanotrasen Representative hat"
desc = "A cap issued to the Nanotrasen Representative"
name = "Nanotrasen Representative's hat"
desc = "A cap issued to Nanotrasen Representatives."
icon_state = "ntrep"
code/modules/clothing/under/miscellaneous.dm
+13 -8
View File
@@ -74,6 +74,7 @@
desc = "A comfortable and durable combat uniform worn by Sol Federation Marine Forces. This one has additional insignia on its shoulders."
icon_state = "solgovc"
item_color = "solgovc"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
/obj/item/clothing/under/solgov/rep
name = "Sol Federation representative's uniform"
@@ -105,6 +106,7 @@
icon_state = "navy_gold"
item_state = "navy_gold"
item_color = "navy_gold"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
displays_id = 0
/obj/item/clothing/under/rank/centcom/captain
@@ -113,19 +115,21 @@
icon_state = "navy_gold"
item_state = "navy_gold"
item_color = "navy_gold"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
displays_id = 0
/obj/item/clothing/under/rank/centcom/blueshield
desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder."
name = "\improper Formal Nanotrasen Uniform"
desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection."
name = "\improper Formal Blueshield's Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
displays_id = 0
/obj/item/clothing/under/rank/centcom/representative
desc = "Gold trim on space-black cloth, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
name = "\improper Formal Nanotrasen Uniform"
name = "\improper Formal Nanotrasen Representative's Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
@@ -137,7 +141,7 @@
/obj/item/clothing/under/rank/centcom/magistrate
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Magistrate\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
name = "\improper Formal Nanotrasen Uniform"
name = "\improper Formal Magistrate's Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
@@ -156,15 +160,15 @@
displays_id = 0
/obj/item/clothing/under/rank/blueshield
name = "blueshield uniform"
desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. Standard issue to Blueshields."
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."
icon_state = "ert_uniform"
item_state = "bl_suit"
item_color = "ert_uniform"
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30)
/obj/item/clothing/under/rank/blueshield/skirt
name = "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"
@@ -849,3 +853,4 @@
icon_state = "tourist"
icon_state = "tourist"
item_color = "tourist"