From e10f2a1f99601dd7176cb043b7e768f1433a63a8 Mon Sep 17 00:00:00 2001 From: Rakkun Date: Mon, 17 Jul 2023 06:21:50 -0300 Subject: [PATCH] Revert "New rings" This reverts commit 99c538d471babaf8705bb0926c9d1937ae18ceb5. --- .../loadout/loadout_gloves_ch.dm | 18 ------------------ .../code/modules/clothing/rings/rings_ch.dm | 14 -------------- .../icons/inventory/hands/item_ch.dmi | Bin 498 -> 0 bytes vorestation.dme | 2 -- 4 files changed, 34 deletions(-) delete mode 100644 modular_chomp/code/modules/client/preference_setup/loadout/loadout_gloves_ch.dm delete mode 100644 modular_chomp/code/modules/clothing/rings/rings_ch.dm delete mode 100644 modular_chomp/icons/inventory/hands/item_ch.dmi diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_gloves_ch.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_gloves_ch.dm deleted file mode 100644 index bcd44283cd..0000000000 --- a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_gloves_ch.dm +++ /dev/null @@ -1,18 +0,0 @@ -// Example: -// /datum/gear/gloves -// display_name = "gloves, black" -// description = "Choose from a number of rings." -// path = /obj/item/clothing/gloves/black -// cost = 1 -// slot = slot_gloves -// sort_category = "Gloves and Handwear" - -/datum/gear/gloves/ringworld1 - display_name = "world gem ring" - path = /obj/item/clothing/gloves/ring/ringworld1 - cost = 1 - -/datum/gear/gloves/ringworld2 - display_name = "world ring" - path = /obj/item/clothing/gloves/ring/ringworld2 - cost = 1 diff --git a/modular_chomp/code/modules/clothing/rings/rings_ch.dm b/modular_chomp/code/modules/clothing/rings/rings_ch.dm deleted file mode 100644 index 5be81121a5..0000000000 --- a/modular_chomp/code/modules/clothing/rings/rings_ch.dm +++ /dev/null @@ -1,14 +0,0 @@ - -/obj/item/clothing/gloves/ring/ringworld1 - name = "world gem ring" - desc = "A ring that has a tiny world inside its glassy gem. You can even see clouds moving." - icon = 'modular_chomp/icons/inventory/hands/item_ch.dmi' - icon_state = "ringworld1" - drop_sound = 'sound/items/drop/ring.ogg' - -/obj/item/clothing/gloves/ring/ringworld2 - name = "world ring" - desc = "A ring that has a tiny landscape all around its exterior. You can even see clouds moving." - icon = 'modular_chomp/icons/inventory/hands/item_ch.dmi' - icon_state = "ringworld2" - drop_sound = 'sound/items/drop/ring.ogg' diff --git a/modular_chomp/icons/inventory/hands/item_ch.dmi b/modular_chomp/icons/inventory/hands/item_ch.dmi deleted file mode 100644 index 90c10cd715293e6e53f798342f715845154d8cc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 498 zcmVfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5; z&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3KBSC^Ij;JijO>#ZZZhGbOXA z7$|7S#hF%=n41b=V=6VmrBqqL)z1a&3;^a&D7?PmUX=g<0J}* zMM}{kPUob!|Goc94t1Bs>~c%|u9}?Y@P)J}_U!q!s8VSS02>=dp~W1nY9ixYa^yCw zHKsvtWZJfP=%@$Cc0jN2IGjc$cd(T~3L#A#MFWz;VICN*D404rhkjnThyqVEE(3#? zE7a4qEAoO{L+b!cqCl%MtPilry}5r1Wd2CI1*9L41!#Dar)mzEImQg92W;{rNGI@& o`9pf~Hcy894SdD-?D^xo0ajcH51-~=H~;_u07*qoM6N<$f?FQN^#A|> diff --git a/vorestation.dme b/vorestation.dme index c5db5a16b9..507defae8a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4587,7 +4587,6 @@ #include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\gear_tweaks.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_general.dm" -#include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_gloves_ch.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm" @@ -4595,7 +4594,6 @@ #include "modular_chomp\code\modules\clothing\clothing_icons.dm" #include "modular_chomp\code\modules\clothing\gateway\gateway.dm" #include "modular_chomp\code\modules\clothing\masks\hailer.dm" -#include "modular_chomp\code\modules\clothing\rings\rings_ch.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\.behemoth.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\precursor.dm"