cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-27 20:35:44 -04:00
committed by Darlantan
parent 3caad465fa
commit 18b634d803
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/defines/obj/weapon.dm
View File

@@ -300,12 +300,8 @@
desc = "A special mechanical module made to store, sort, and apply standard machine parts."
icon = 'icons/obj/storage_vr.dmi'
icon_state = "RPED"
<<<<<<< HEAD
item_icons = list(slot_l_hand_str = 'icons/vore/custom_items_left_hand_yw.dmi', slot_r_hand_str = 'icons/vore/custom_items_right_hand_yw.dmi') //YW add - RPED sprite
||||||| parent of a027154001... Merge pull request #11665 from Hatterhat/brrrrped
=======
item_state = "RPED"
>>>>>>> a027154001... Merge pull request #11665 from Hatterhat/brrrrped
w_class = ITEMSIZE_HUGE
can_hold = list(/obj/item/weapon/stock_parts)
storage_slots = 50
@@ -334,26 +330,9 @@
/obj/item/weapon/storage/part_replacer/adv
name = "advanced rapid part exchange device"
<<<<<<< HEAD
desc = "A special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity."
icon_state = "RPED"
w_class = ITEMSIZE_HUGE
//YAWN Changes
can_hold = list(
/obj/item/weapon/cell,
/obj/item/weapon/stock_parts,
/obj/item/weapon/reagent_containers/glass/beaker)
//End of YAWN Changes
||||||| parent of a027154001... Merge pull request #11665 from Hatterhat/brrrrped
desc = "A special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity."
icon_state = "RPED"
w_class = ITEMSIZE_HUGE
can_hold = list(/obj/item/weapon/stock_parts)
=======
desc = "A special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity, \
and the ability to hold beakers."
can_hold = list(/obj/item/weapon/stock_parts, /obj/item/weapon/reagent_containers/glass/beaker)
>>>>>>> a027154001... Merge pull request #11665 from Hatterhat/brrrrped
storage_slots = 200
max_storage_space = 400