Overhauls and 2/28 sync (#244)
* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
This commit is contained in:
Poojawa
@@ -55,71 +55,3 @@
|
||||
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
|
||||
resistance_flags = 0
|
||||
armor = list(melee = 15, bullet = 35, laser = 35, energy = 20, bomb = 35, bio = 35, rad = 35, fire = 0, acid = 0)
|
||||
|
||||
/obj/item/clothing/gloves/batmangloves
|
||||
desc = "Used for handling all things bat related."
|
||||
name = "batgloves"
|
||||
icon_state = "bmgloves"
|
||||
item_state = "bmgloves"
|
||||
item_color = "bmgloves"
|
||||
|
||||
|
||||
obj/item/clothing/gloves/bikergloves
|
||||
name = "Biker's Gloves"
|
||||
icon_state = "biker-gloves"
|
||||
item_state = "biker-gloves"
|
||||
item_color = "bikergloves"
|
||||
|
||||
/obj/item/clothing/gloves/megagloves
|
||||
desc = "Uncomfortably bulky armored gloves."
|
||||
name = "DRN-001 Gloves"
|
||||
icon_state = "megagloves"
|
||||
item_state = "megagloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/protogloves
|
||||
desc = "Funcionally identical to the DRN-001 model's, but in red!"
|
||||
name = "Prototype Gloves"
|
||||
icon_state = "protogloves"
|
||||
item_state = "protogloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/megaxgloves
|
||||
desc = "An upgrade to the DRN-001's gauntlets, retains the uncomfortable armor, but comes with white gloves!"
|
||||
name = "Maverick Hunter gloves"
|
||||
icon_state = "megaxgloves"
|
||||
item_state = "megaxgloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/joegloves
|
||||
desc = "Large grey gloves, very similar to the Prototype's."
|
||||
name = "Sniper Gloves"
|
||||
icon_state = "joegloves"
|
||||
item_state = "joegloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/doomguy
|
||||
desc = ""
|
||||
name = "Doomguy's gloves"
|
||||
icon_state = "doom"
|
||||
item_state = "doom"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/anchor_arms
|
||||
name = "Anchor Arms"
|
||||
desc = "When you're a jerk, everybody loves you."
|
||||
icon_state = "anchorarms"
|
||||
item_state = "anchorarms"
|
||||
|
||||
/obj/item/clothing/gloves/neorussian
|
||||
name = "neo-Russian gloves"
|
||||
desc = "Utilizes a non-slip technology that allows you to never drop your precious bottles of vodka."
|
||||
icon_state = "nr_gloves"
|
||||
item_state = "nr_gloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/neorussian/fingerless
|
||||
name = "neo-Russian fingerless gloves"
|
||||
desc = "For these tense combat situations when you just have to pick your nose."
|
||||
icon_state = "nr_fgloves"
|
||||
item_state = "nr_fgloves"
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
|
||||
/obj/item/clothing/gloves/batmangloves
|
||||
desc = "Used for handling all things bat related."
|
||||
name = "batgloves"
|
||||
icon_state = "bmgloves"
|
||||
item_state = "bmgloves"
|
||||
item_color = "bmgloves"
|
||||
|
||||
|
||||
obj/item/clothing/gloves/bikergloves
|
||||
name = "Biker's Gloves"
|
||||
icon_state = "biker-gloves"
|
||||
item_state = "biker-gloves"
|
||||
item_color = "bikergloves"
|
||||
|
||||
/obj/item/clothing/gloves/megagloves
|
||||
desc = "Uncomfortably bulky armored gloves."
|
||||
name = "DRN-001 Gloves"
|
||||
icon_state = "megagloves"
|
||||
item_state = "megagloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/protogloves
|
||||
desc = "Funcionally identical to the DRN-001 model's, but in red!"
|
||||
name = "Prototype Gloves"
|
||||
icon_state = "protogloves"
|
||||
item_state = "protogloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/megaxgloves
|
||||
desc = "An upgrade to the DRN-001's gauntlets, retains the uncomfortable armor, but comes with white gloves!"
|
||||
name = "Maverick Hunter gloves"
|
||||
icon_state = "megaxgloves"
|
||||
item_state = "megaxgloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/joegloves
|
||||
desc = "Large grey gloves, very similar to the Prototype's."
|
||||
name = "Sniper Gloves"
|
||||
icon_state = "joegloves"
|
||||
item_state = "joegloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/doomguy
|
||||
desc = ""
|
||||
name = "Doomguy's gloves"
|
||||
icon_state = "doom"
|
||||
item_state = "doom"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/anchor_arms
|
||||
name = "Anchor Arms"
|
||||
desc = "When you're a jerk, everybody loves you."
|
||||
icon_state = "anchorarms"
|
||||
item_state = "anchorarms"
|
||||
|
||||
/obj/item/clothing/gloves/neorussian
|
||||
name = "neo-Russian gloves"
|
||||
desc = "Utilizes a non-slip technology that allows you to never drop your precious bottles of vodka."
|
||||
icon_state = "nr_gloves"
|
||||
item_state = "nr_gloves"
|
||||
|
||||
|
||||
/obj/item/clothing/gloves/neorussian/fingerless
|
||||
name = "neo-Russian fingerless gloves"
|
||||
desc = "For these tense combat situations when you just have to pick your nose."
|
||||
icon_state = "nr_fgloves"
|
||||
item_state = "nr_fgloves"
|
||||
Reference in New Issue
Block a user