cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 12:05:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Modular] Adds a thinner variant of the choker (#22685)

Browse Source 
* The beginning and the end (hopefully)

* Update modular_skyrat/modules/customization/modules/clothing/neck/collars.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
Jureiia
2023-07-29 20:51:50 +01:00
committed by nevimer
parent a6afbf1012
commit b87a845e19
7 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/GAGS/greyscale_configs.dm
+9
View File
@@ -333,6 +333,15 @@
name = "Choker (Worn)"
json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/choker_worn.json'
// Thin Choker
/datum/greyscale_config/collar/thinchoker
name = "Thin Choker"
json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json'
/datum/greyscale_config/collar/thinchoker/worn
name = "Thin Choker (Worn)"
json_config = 'modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json'
// Cow
/datum/greyscale_config/collar/cow
name = "Cowbell Collar"
modular_skyrat/modules/GAGS/icons/collar.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

modular_skyrat/modules/GAGS/json_configs/collar/thinchoker.json
+10
View File
@@ -0,0 +1,10 @@
{
"thinchoker": [
{
"type": "icon_state",
"icon_state": "thinchoker_obj",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/GAGS/json_configs/collar/thinchoker_worn.json
+10
View File
@@ -0,0 +1,10 @@
{
"thinchoker": [
{
"type": "icon_state",
"icon_state": "thinchoker_mob",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
+8
View File
@@ -52,6 +52,14 @@
greyscale_config_worn = /datum/greyscale_config/collar/choker/worn
greyscale_colors = "#222222"
/obj/item/clothing/neck/human_petcollar/thinchoker
name = "thin choker"
desc = "Like the normal one, but thinner!"
icon_state = "thinchoker"
greyscale_config = /datum/greyscale_config/collar/thinchoker
greyscale_config_worn = /datum/greyscale_config/collar/thinchoker/worn
greyscale_colors = "#222222"
/obj/item/key/collar
name = "collar key"
desc = "A key for a tiny lock on a collar or bag."
modular_skyrat/modules/loadouts/loadout_items/loadout_datum_neck.dm
+4
View File
@@ -127,6 +127,10 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck)
name = "Choker"
item_path = /obj/item/clothing/neck/human_petcollar/choker
/datum/loadout_item/neck/thinchoker
name = "Thin Choker"
item_path = /obj/item/clothing/neck/human_petcollar/thinchoker
/datum/loadout_item/neck/collar
name = "Collar"
item_path = /obj/item/clothing/neck/human_petcollar
modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm
+1
View File
@@ -58,6 +58,7 @@
/obj/item/clothing/neck/kink_collar = 8,
/obj/item/clothing/neck/human_petcollar = 8,
/obj/item/clothing/neck/human_petcollar/choker = 8,
/obj/item/clothing/neck/human_petcollar/thinchoker = 8,
/obj/item/clothing/neck/human_petcollar/locked/cow = 8,
/obj/item/clothing/neck/human_petcollar/locked/bell = 8,
/obj/item/clothing/neck/human_petcollar/locked/cross = 8,