shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit

Browse Source
This commit is contained in:
Useroth
2019-05-15 02:09:41 +02:00
parent 6a29a0744b 3f64128513
commit 8500e69088
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/neck/_neck.dm
+4 -4
View File
@@ -213,7 +213,7 @@
hasprimary = TRUE
hassecondary = TRUE
primary_color = "#000000"
primary_color = "#222222"
secondary_color = "#888888"
/obj/item/clothing/neck/petcollar/choker
@@ -223,7 +223,7 @@
item_color = "choker"
hasprimary = TRUE
primary_color = "#000000"
primary_color = "#222222"
/obj/item/clothing/neck/petcollar/locked
name = "locked collar"
@@ -255,7 +255,7 @@
hasprimary = TRUE
hassecondary = TRUE
primary_color = "#000000"
primary_color = "#222222"
secondary_color = "#888888"
/obj/item/clothing/neck/petcollar/locked/choker
@@ -265,7 +265,7 @@
item_color = "choker"
hasprimary = TRUE
primary_color = "#000000"
primary_color = "#222222"
/obj/item/key/collar
name = "Collar Key"