Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions data/src/pack/obj.pack
Original file line number Diff line number Diff line change
Expand Up @@ -2378,14 +2378,14 @@
2377=ogre_tooth
2378=obj_2378
2379=rock_cake
2380=obj_2380
2381=obj_2381
2382=obj_2382
2383=obj_2383
2384=obj_2384
2385=obj_2385
2386=obj_2386
2387=obj_2387
2380=watchtower_crystal1
2381=watchtower_crystal2
2382=watchtower_crystal3
2383=watchtower_crystal4
2384=fingernails
2385=old_robe
2386=unusual_armour
2387=damaged_dagger
2388=tattered_eye_patch
2389=vial_water_jangerberries
2390=mixture_guam_jangerberries
Expand Down
16 changes: 8 additions & 8 deletions data/src/scripts/_unpack/all.obj
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ iop2=Eat
category=category_734
tradeable=no

[obj_2380]
[watchtower_crystal1]
name=Crystal
model=model_2335_obj
recol1s=22292
Expand All @@ -1195,7 +1195,7 @@ weight=2lb
members=yes
tradeable=no

[obj_2381]
[watchtower_crystal2]
name=Crystal
model=model_2335_obj
recol1s=22292
Expand All @@ -1210,7 +1210,7 @@ weight=2lb
members=yes
tradeable=no

[obj_2382]
[watchtower_crystal3]
name=Crystal
model=model_2335_obj
recol1s=22292
Expand All @@ -1225,7 +1225,7 @@ weight=2lb
members=yes
tradeable=no

[obj_2383]
[watchtower_crystal4]
name=Crystal
model=model_2335_obj
recol1s=2978
Expand All @@ -1240,7 +1240,7 @@ weight=2lb
members=yes
tradeable=no

[obj_2384]
[fingernails]
name=Finger nails
desc=Eeeeyeeew!
model=model_1787_obj
Expand All @@ -1252,7 +1252,7 @@ weight=2g
members=yes
tradeable=no

[obj_2385]
[old_robe]
name=Old robe
desc=I can't wear this old thing.
model=model_2786_obj
Expand All @@ -1263,7 +1263,7 @@ weight=4lb
members=yes
tradeable=no

[obj_2386]
[unusual_armour]
name=Unusual armour
desc=Looks kind of useless...
model=model_2574_obj
Expand All @@ -1274,7 +1274,7 @@ weight=8lb
members=yes
tradeable=no

[obj_2387]
[damaged_dagger]
name=Damaged dagger
desc=Pointy.
model=model_2672_obj
Expand Down
Loading