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

Merge branch 'master' into var/const-to-define

Browse Source
This commit is contained in:
AffectedArc07
2020-03-03 22:44:07 +00:00
parent af9ed93abf fe396a40c9
commit a1fa46f5a8
101 changed files with 614 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/glasses.dm
+5
View File
@@ -274,6 +274,11 @@
see_in_dark = 0
flash_protect = 0
tint = 0
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Drask" = 'icons/mob/species/drask/eyes.dmi',
"Grey" = 'icons/mob/species/grey/eyes.dmi'
)
/obj/item/clothing/glasses/sunglasses/noir
name = "noir sunglasses"
code/modules/clothing/gloves/rings.dm
+14 -9
View File
@@ -9,16 +9,14 @@
var/fluff_material = FALSE //If true, will ignore the material when examining
var/material = "iron"
var/stud = 0
var/ring_color = "iron"
/obj/item/clothing/gloves/ring/New()
..()
update_icon()
/obj/item/clothing/gloves/ring/update_icon()
if(stud)
icon_state = "d_[initial(icon_state)]"
else
icon_state = initial(icon_state)
icon_state = "[stud ? "d_" : ""][ring_color]ring"
/obj/item/clothing/gloves/ring/examine(mob/user)
. = ..()
@@ -44,6 +42,7 @@
name = "silver ring"
icon_state = "silverring"
material = "silver"
ring_color = "silver"
/obj/item/clothing/gloves/ring/silver/blessed // todo
name = "blessed silver ring"
@@ -52,6 +51,7 @@
name = "gold ring"
icon_state = "goldring"
material = "gold"
ring_color = "gold"
/obj/item/clothing/gloves/ring/gold/blessed
name = "wedding band"
@@ -61,40 +61,45 @@
name = "white plastic ring"
icon_state = "whitering"
material = "plastic"
ring_color = "white"
/obj/item/clothing/gloves/ring/plastic/blue
name = "blue plastic ring"
icon_state = "bluering"
ring_color = "blue"
/obj/item/clothing/gloves/ring/plastic/red
name = "red plastic ring"
icon_state = "redring"
/obj/item/clothing/gloves/ring/plastic/random
ring_color = "red"
/obj/item/clothing/gloves/ring/plastic/random/New()
var/c = pick("white","blue","red")
name = "[c] plastic ring"
icon_state = "[c]ring"
ring_color = pick("white","blue","red")
name = "[ring_color] plastic ring"
..()
// weird
/obj/item/clothing/gloves/ring/glass
name = "glass ring"
icon_state = "whitering"
material = "glass"
ring_color = "white"
/obj/item/clothing/gloves/ring/plasma
name = "plasma ring"
icon_state = "plasmaring"
material = "plasma"
ring_color = "plasma"
/obj/item/clothing/gloves/ring/uranium
name = "uranium ring"
icon_state = "uraniumring"
material = "uranium"
ring_color = "uranium"
// cultish
/obj/item/clothing/gloves/ring/shadow
name = "shadow ring"
icon_state = "shadowring"
material = "shadows"
ring_color = "shadow"
code/modules/clothing/under/miscellaneous.dm
+19 -22
View File
@@ -96,38 +96,35 @@
item_color = "centcom"
/obj/item/clothing/under/rank/centcom/officer
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant-Commander\" and bears \"N.C.V. Fearless CV-286\" on the left shoulder."
name = "\improper Nanotrasen Officers Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant-Commander\" and bears \"N.A.S. Trurl \" on the left shoulder. Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection."
name = "\improper Nanotrasen Naval Officer Uniform"
icon_state = "navy_gold"
item_state = "navy_gold"
item_color = "navy_gold"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/captain
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.C.V. Fearless CV-286\" on the left shoulder."
name = "\improper Nanotrasen Captains Uniform"
icon_state = "centcom"
item_state = "dg_suit"
item_color = "centcom"
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Captain\" and bears \"N.A.S. Trurl \" on the left shoulder. Worn exclusively by officers of the Nanotrasen Navy. It's got exotic materials for protection."
name = "\improper Nanotrasen Naval Captain Uniform"
icon_state = "navy_gold"
item_state = "navy_gold"
item_color = "navy_gold"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/blueshield
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
name = "\improper Nanotrasen Navy Uniform"
desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder."
name = "\improper Formal Nanotrasen Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
displays_id = 0
flags_size = ONESIZEFITSALL
/obj/item/clothing/under/rank/centcom/blueshield/New()
..()
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Lieutenant\" and bears [station_name()] on the left shoulder."
/obj/item/clothing/under/rank/centcom/representative
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.S.S. Cyberiad\" on the left shoulder."
name = "\improper Nanotrasen Navy Uniform"
desc = "Gold trim on space-black cloth, this uniform bears \"N.S.S. Cyberiad\" on the left shoulder."
name = "\improper Formal Nanotrasen Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
@@ -136,11 +133,11 @@
/obj/item/clothing/under/rank/centcom/representative/New()
..()
desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears [station_name()] on the left shoulder."
desc = "Gold trim on space-black cloth, this uniform bears [station_name()] on the left shoulder."
/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 Nanotrasen Navy Uniform"
name = "\improper Formal Nanotrasen Uniform"
icon_state = "officer"
item_state = "g_suit"
item_color = "officer"
@@ -161,7 +158,7 @@
/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 Blueshield officers."
desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. Standard issue to Blueshields."
icon_state = "ert_uniform"
item_state = "bl_suit"
item_color = "ert_uniform"
@@ -169,7 +166,7 @@
/obj/item/clothing/under/rank/blueshield/skirt
name = "blueshield skirt"
desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield officers."
desc = "A short, black and grey with blue markings skirted uniform. For the feminine Blueshield."
icon_state = "blueshieldf"
item_state = "blueshieldf"
item_color = "blueshieldf"