cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missing inhands

Browse Source
This commit is contained in:
shizcalev
2017-08-21 18:29:51 -04:00
parent 637d75e806
commit ffa5d9e388
41 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/chrono_eraser.dm
+2
View File
@@ -6,6 +6,8 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronobackpack"
item_state = "backpack"
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
slowdown = 1
code/game/objects/items/devices/flashlight.dm
+2
View File
@@ -208,6 +208,8 @@
desc = "A desk lamp with an adjustable mount."
icon_state = "lamp"
item_state = "lamp"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
brightness_on = 5
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
code/game/objects/items/gift.dm
+1 -1
View File
@@ -12,7 +12,7 @@
desc = "PRESENTS!!!! eek!"
icon = 'icons/obj/storage.dmi'
icon_state = "giftdeliverypackage3"
item_state = "gift1"
item_state = "gift"
resistance_flags = FLAMMABLE
/obj/item/a_gift/New()
code/game/objects/items/grenades/plastic.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "plastic explosive"
desc = "Used to put holes in specific areas without too much extra hole."
icon_state = "plastic-explosive0"
item_state = "plastic-explosive"
item_state = "plasticx"
flags_1 = NOBLUDGEON_1
flags_2 = NO_EMP_WIRES_2
det_time = 10
code/game/objects/items/his_grace.dm
+2
View File
@@ -9,6 +9,8 @@
desc = "A toolbox painted bright green. Looking at it makes you feel uneasy."
icon_state = "his_grace"
item_state = "artistic_toolbox"
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
icon = 'icons/obj/items_and_weapons.dmi'
w_class = WEIGHT_CLASS_GIGANTIC
origin_tech = "combat=4;engineering=4;syndicate=2"
code/game/objects/items/holy_weapons.dm
+2
View File
@@ -332,6 +332,8 @@
icon = 'icons/obj/toy.dmi'
icon_state = "carpplushie"
item_state = "carp_plushie"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 15
attack_verb = list("bitten", "eaten", "fin slapped")
hitsound = 'sound/weapons/bite.ogg'
code/game/objects/items/kitchen.dm
+2
View File
@@ -89,6 +89,8 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "render"
item_state = "knife"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
/obj/item/kitchen/knife/butcher
code/game/objects/items/melee/misc.dm
+2
View File
@@ -36,6 +36,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "arm_blade"
item_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
origin_tech = "combat=5;biotech=5"
w_class = WEIGHT_CLASS_HUGE
force = 20
code/game/objects/items/storage/boxes.dm
+16 -15
View File
@@ -732,16 +732,17 @@
/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
illustration = "donk_kit"
item_state = null
icon_state = null
/obj/item/storage/box/ingredients/Initialize()
..()
if(item_state)
name = "[name] ([item_state])"
desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[item_state]'."
if(icon_state)
name = "[name] ([icon_state])"
desc = "A box containing supplementary ingredients for the aspiring chef. This box's theme is '[icon_state]'."
item_state = "syringe_kit"
/obj/item/storage/box/ingredients/wildcard
item_state = "wildcard"
icon_state = "wildcard"
/obj/item/storage/box/ingredients/wildcard/PopulateContents()
for(var/i in 1 to 7)
@@ -762,7 +763,7 @@
new randomFood(src)
/obj/item/storage/box/ingredients/fiesta
item_state = "fiesta"
icon_state = "fiesta"
/obj/item/storage/box/ingredients/fiesta/PopulateContents()
new /obj/item/reagent_containers/food/snacks/tortilla(src)
@@ -772,7 +773,7 @@
new /obj/item/reagent_containers/food/snacks/grown/chili(src)
/obj/item/storage/box/ingredients/italian
item_state = "italian"
icon_state = "italian"
/obj/item/storage/box/ingredients/italian/PopulateContents()
for(var/i in 1 to 3)
@@ -781,7 +782,7 @@
new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
/obj/item/storage/box/ingredients/vegetarian
item_state = "vegetarian"
icon_state = "vegetarian"
/obj/item/storage/box/ingredients/vegetarian/PopulateContents()
for(var/i in 1 to 2)
@@ -793,7 +794,7 @@
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
/obj/item/storage/box/ingredients/american
item_state = "american"
icon_state = "american"
/obj/item/storage/box/ingredients/american/PopulateContents()
for(var/i in 1 to 2)
@@ -803,7 +804,7 @@
new /obj/item/reagent_containers/food/snacks/faggot(src)
/obj/item/storage/box/ingredients/fruity
item_state = "fruity"
icon_state = "fruity"
/obj/item/storage/box/ingredients/fruity/PopulateContents()
for(var/i in 1 to 2)
@@ -814,7 +815,7 @@
new /obj/item/reagent_containers/food/snacks/grown/watermelon(src)
/obj/item/storage/box/ingredients/sweets
item_state = "sweets"
icon_state = "sweets"
/obj/item/storage/box/ingredients/sweets/PopulateContents()
for(var/i in 1 to 2)
@@ -825,7 +826,7 @@
new /obj/item/reagent_containers/food/snacks/grown/apple(src)
/obj/item/storage/box/ingredients/delights
item_state = "delights"
icon_state = "delights"
/obj/item/storage/box/ingredients/delights/PopulateContents()
for(var/i in 1 to 2)
@@ -836,7 +837,7 @@
new /obj/item/reagent_containers/food/snacks/grown/berries(src)
/obj/item/storage/box/ingredients/grains
item_state = "grains"
icon_state = "grains"
/obj/item/storage/box/ingredients/grains/PopulateContents()
for(var/i in 1 to 3)
@@ -847,7 +848,7 @@
new /obj/item/seeds/poppy(src)
/obj/item/storage/box/ingredients/carnivore
item_state = "carnivore"
icon_state = "carnivore"
/obj/item/storage/box/ingredients/carnivore/PopulateContents()
new /obj/item/reagent_containers/food/snacks/meat/slab/bear(src)
@@ -859,7 +860,7 @@
new /obj/item/reagent_containers/food/snacks/faggot(src)
/obj/item/storage/box/ingredients/exotic
item_state = "exotic"
icon_state = "exotic"
/obj/item/storage/box/ingredients/exotic/PopulateContents()
for(var/i in 1 to 2)
code/game/objects/items/storage/firstaid.dm
+2
View File
@@ -145,6 +145,8 @@
icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi'
item_state = "contsolid"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
can_hold = list(/obj/item/reagent_containers/pill, /obj/item/dice)
allow_quick_gather = 1
code/game/objects/items/toys.dm
+7
View File
@@ -40,6 +40,7 @@
icon = 'icons/obj/toy.dmi'
icon_state = "waterballoon-e"
item_state = "balloon-empty"
/obj/item/toy/balloon/New()
create_reagents(10)
@@ -278,6 +279,8 @@
icon = 'icons/obj/toy.dmi'
icon_state = "foamblade"
item_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
attack_verb = list("pricked", "absorbed", "gored")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
@@ -288,6 +291,8 @@
desc = "A replica toolbox that rumbles when you turn the key"
icon_state = "his_grace"
item_state = "artistic_toolbox"
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
var/active = FALSE
icon = 'icons/obj/items_and_weapons.dmi'
attack_verb = list("robusted")
@@ -547,6 +552,8 @@
desc = "A tool to help you write fictional devils!"
icon = 'icons/obj/library.dmi'
icon_state = "demonomicon"
lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
recharge_time = 60