mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-29 08:11:11 +01:00
[MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
3ef8163aa0
commit
789db280cc
@@ -26,21 +26,21 @@
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/head/fluff/wolfgirl
|
||||
name = "Wolfgirl Hat"
|
||||
desc = "An odd, small hat with two strings attached to it."
|
||||
name = "Wolfgirl Hat"
|
||||
desc = "An odd, small hat with two strings attached to it."
|
||||
|
||||
icon_state = "wolfgirlhat"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
icon_state = "wolfgirlhat"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/shoes/fluff/wolfgirl
|
||||
name = "Red Sandals"
|
||||
desc = "A pair of sandals that make you want to awoo!"
|
||||
name = "Red Sandals"
|
||||
desc = "A pair of sandals that make you want to awoo!"
|
||||
|
||||
icon_state = "wolfgirlsandals"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
icon_state = "wolfgirlsandals"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Natje: Awen Henry
|
||||
/obj/item/clothing/under/fluff/wolfgirl
|
||||
@@ -2417,11 +2417,11 @@ Departamental Swimsuits, for general use
|
||||
|
||||
//Uncle_Fruit_VEVO - Bradley Khatibi
|
||||
/obj/item/clothing/shoes/fluff/airjordans
|
||||
name = "A pair of Air Jordan 1 Mid 'Black Gym Red's"
|
||||
desc = "Appearing in a classic Jordan Brand colorway, the Air Jordan 1 Mid 'Black Gym Red' released in May 2021. Built with leather, the shoe's upper sports a white base, contrasted by black on the overlays and highlighted by Gym Red on the padded collar, 'Wings' logo and Swoosh branding. A breathable nylon tongue and perforated toe box support the fit, while underfoot, a standard rubber cupsole with Air in the heel anchors the build."
|
||||
icon_state = "airjordans"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
name = "A pair of Air Jordan 1 Mid 'Black Gym Red's"
|
||||
desc = "Appearing in a classic Jordan Brand colorway, the Air Jordan 1 Mid 'Black Gym Red' released in May 2021. Built with leather, the shoe's upper sports a white base, contrasted by black on the overlays and highlighted by Gym Red on the padded collar, 'Wings' logo and Swoosh branding. A breathable nylon tongue and perforated toe box support the fit, while underfoot, a standard rubber cupsole with Air in the heel anchors the build."
|
||||
icon_state = "airjordans"
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||
|
||||
//Pandora029:Shona Young
|
||||
/obj/item/clothing/under/fluff/foxoflightsuit
|
||||
@@ -2675,11 +2675,11 @@ End CHOMP Removal*/
|
||||
//sixberry: Thistle
|
||||
|
||||
/obj/item/clothing/head/fluff/memory_crown
|
||||
name = "Memory Crown"
|
||||
desc = "A thorned crown sporting numerous amethyst inserts, all of which seem to glow faintly in the dark. Just holding it makes you feel as though you've forgotten something unpleasant."
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "memorycrown"
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
item_state = "memorycrown_onmob"
|
||||
slot_flags = SLOT_HEAD
|
||||
name = "Memory Crown"
|
||||
desc = "A thorned crown sporting numerous amethyst inserts, all of which seem to glow faintly in the dark. Just holding it makes you feel as though you've forgotten something unpleasant."
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "memorycrown"
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
item_state = "memorycrown_onmob"
|
||||
slot_flags = SLOT_HEAD
|
||||
*/ //Chomp REMOVE END
|
||||
|
||||
@@ -1148,31 +1148,31 @@
|
||||
item_state = "tesh_cloak_saroth"
|
||||
|
||||
/obj/item/clothing/accessory/poncho/cloak/fluff/Jaree
|
||||
name = "plain cloak"
|
||||
desc = "A plain cloak to be worn for warmth or comfort. Looks cozy."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "jaree_cloak"
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "jaree_cloak"
|
||||
name = "plain cloak"
|
||||
desc = "A plain cloak to be worn for warmth or comfort. Looks cozy."
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "jaree_cloak"
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "jaree_cloak"
|
||||
|
||||
/obj/item/clothing/head/ushanka/alt/fluff/Jaree
|
||||
name = "ushanka"
|
||||
desc = "Perfect for winter in Siberia, da?"
|
||||
icon_state = "ushanka2down"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "ushanka2down"
|
||||
flags_inv = HIDEEARS
|
||||
name = "ushanka"
|
||||
desc = "Perfect for winter in Siberia, da?"
|
||||
icon_state = "ushanka2down"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = "ushanka2down"
|
||||
flags_inv = HIDEEARS
|
||||
|
||||
/obj/item/clothing/head/ushanka/alt/fluff/Jaree/attack_self(mob/user as mob)
|
||||
if(src.icon_state == "ushanka2down")
|
||||
src.icon_state = "ushanka2up"
|
||||
src.item_state = "ushanka2up"
|
||||
user << "You raise the ear flaps on the ushanka."
|
||||
else
|
||||
src.icon_state = "ushanka2down"
|
||||
src.item_state = "ushanka2down"
|
||||
user << "You lower the ear flaps on the ushanka."
|
||||
if(src.icon_state == "ushanka2down")
|
||||
src.icon_state = "ushanka2up"
|
||||
src.item_state = "ushanka2up"
|
||||
user << "You raise the ear flaps on the ushanka."
|
||||
else
|
||||
src.icon_state = "ushanka2down"
|
||||
src.item_state = "ushanka2down"
|
||||
user << "You lower the ear flaps on the ushanka."
|
||||
|
||||
// ******
|
||||
// Benl8561
|
||||
@@ -1235,13 +1235,13 @@
|
||||
item_state = "noel_glasses"
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/hoodie/fluff/noel_hoodie
|
||||
name = "Noel's casual hoodie"
|
||||
desc = "A blue faded black trimmed hoodie, it looks very simple and warm, there are the initials N.W. on the tag inside"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "noel_hoodie"
|
||||
// "noel_hoodie_open" will be the open state
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = null
|
||||
name = "Noel's casual hoodie"
|
||||
desc = "A blue faded black trimmed hoodie, it looks very simple and warm, there are the initials N.W. on the tag inside"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "noel_hoodie"
|
||||
// "noel_hoodie_open" will be the open state
|
||||
icon_override = 'icons/vore/custom_onmob_yw.dmi'
|
||||
item_state = null
|
||||
|
||||
/obj/item/clothing/ears/earings/fluff/noel_earings
|
||||
name = "Teardrop Earrings"
|
||||
@@ -1561,13 +1561,13 @@
|
||||
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35)
|
||||
|
||||
/obj/item/clothing/accessory/poncho/cloak/fluff/mocha
|
||||
name = "Elaborate Cloak"
|
||||
desc = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "mocha_cloak"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "mocha_cloak_s"
|
||||
overlay_state = "mocha_cloak_s"
|
||||
name = "Elaborate Cloak"
|
||||
desc = "A cloak denoting the rank of a warden, the name \"Mocha\" is embroidered along the collar in red lettering"
|
||||
icon = 'icons/vore/custom_clothes_yw.dmi'
|
||||
icon_state = "mocha_cloak"
|
||||
icon_override = 'icons/vore/custom_clothes_yw.dmi'
|
||||
item_state = "mocha_cloak_s"
|
||||
overlay_state = "mocha_cloak_s"
|
||||
|
||||
// ******
|
||||
// Lawst
|
||||
|
||||
@@ -1162,22 +1162,21 @@
|
||||
|
||||
//RadiantAurora: Tiemli Kroto
|
||||
/obj/item/clothing/glasses/welding/tiemgogs
|
||||
name = "custom-fitted welding goggles"
|
||||
desc = "A pair of thick, custom-fitted goggles with LEDs above the lenses. Ruggedly engraved below the lenses is the name 'Tiemli Kroto'."
|
||||
name = "custom-fitted welding goggles"
|
||||
desc = "A pair of thick, custom-fitted goggles with LEDs above the lenses. Ruggedly engraved below the lenses is the name 'Tiemli Kroto'."
|
||||
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "tiemgogs"
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "tiemgogs"
|
||||
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "tiemgogs"
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "tiemgogs"
|
||||
|
||||
/obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
|
||||
if(..())
|
||||
if(H.ckey != "radiantaurora")
|
||||
to_chat(H, span_warning("These don't look like they were made to fit you..."))
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
if(..())
|
||||
if(H.ckey != "radiantaurora")
|
||||
to_chat(H, span_warning("These don't look like they were made to fit you..."))
|
||||
return 0
|
||||
return 1
|
||||
|
||||
//Ryumi - Nikki Yumeno
|
||||
/obj/item/rig/nikki
|
||||
@@ -1222,11 +1221,11 @@
|
||||
|
||||
//Nickcrazy - Damon Bones Xrim
|
||||
/obj/item/clothing/suit/storage/toggle/bomber/bombersec
|
||||
name = "Security Bomber Jacket"
|
||||
desc = "A black bomber jacket with the security emblem sewn onto it."
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "bombersec"
|
||||
name = "Security Bomber Jacket"
|
||||
desc = "A black bomber jacket with the security emblem sewn onto it."
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_override = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "bombersec"
|
||||
|
||||
|
||||
//pimientopyro - Scylla Casmus
|
||||
@@ -1479,21 +1478,21 @@ End CHOMP Removal*/
|
||||
|
||||
//Bricker98:Nettie Stough
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/nettie
|
||||
name = "Remodeled Tablet"
|
||||
desc = "A tablet computer, looks quite high-tech and has some emblems on the back."
|
||||
icon = 'icons/obj/modular_tablet.dmi'
|
||||
icon_state = "elite"
|
||||
icon_state_unpowered = "elite"
|
||||
name = "Remodeled Tablet"
|
||||
desc = "A tablet computer, looks quite high-tech and has some emblems on the back."
|
||||
icon = 'icons/obj/modular_tablet.dmi'
|
||||
icon_state = "elite"
|
||||
icon_state_unpowered = "elite"
|
||||
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/nettie/install_default_hardware()
|
||||
..()
|
||||
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
|
||||
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
|
||||
hard_drive = new/obj/item/computer_hardware/hard_drive/(src)
|
||||
network_card = new/obj/item/computer_hardware/network_card/advanced(src)
|
||||
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
|
||||
battery_module = new/obj/item/computer_hardware/battery_module(src)
|
||||
battery_module.charge_to_full()
|
||||
..()
|
||||
processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
|
||||
tesla_link = new/obj/item/computer_hardware/tesla_link(src)
|
||||
hard_drive = new/obj/item/computer_hardware/hard_drive/(src)
|
||||
network_card = new/obj/item/computer_hardware/network_card/advanced(src)
|
||||
nano_printer = new/obj/item/computer_hardware/nano_printer(src)
|
||||
battery_module = new/obj/item/computer_hardware/battery_module(src)
|
||||
battery_module.charge_to_full()
|
||||
|
||||
|
||||
//Stobarico - Kyu Comet
|
||||
|
||||
@@ -666,15 +666,15 @@
|
||||
slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi',
|
||||
)
|
||||
var/list/has_items = list(
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
)
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar,
|
||||
)
|
||||
|
||||
/obj/item/storage/secure/briefcase/fluff/jeans/New() //this is entierly nessicary to spawn stuff. "FUN" -luke
|
||||
storage_slots = has_items.len
|
||||
|
||||
Reference in New Issue
Block a user