all is in there

This commit is contained in:
DeityLink
2014-10-19 17:03:12 +02:00
parent 5d2af9b873
commit b9efb1b675
51 changed files with 42 additions and 28 deletions

View File

@@ -514,7 +514,7 @@
w_class = 1.0
force = 5.0
throwforce = 15.0
item_state = "shard-glass"
item_state = "shard-glassnew"
g_amt = 3750
w_type = RECYK_GLASS
attack_verb = list("stabbed", "slashed", "sliced", "cut")

View File

@@ -2,7 +2,7 @@
name = "Soul Stone Shard"
icon = 'icons/obj/wizard.dmi'
icon_state = "soulstone"
item_state = "electronic"
item_state = "shard-soulstone"
desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
w_class = 1.0
flags = FPRINT | TABLEPASS

View File

@@ -17,7 +17,7 @@
name = "Circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "id_mod"
item_state = "electronic"
item_state = "circuitboard"
origin_tech = "programming=2"
g_amt=2000 // Recycle glass only
w_type = RECYK_ELECTRONIC

View File

@@ -408,7 +408,7 @@
name = "Exosuit Circuit board"
icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
item_state = "electronic"
item_state = "circuitboard"
board_type = "other"
flags = FPRINT | TABLEPASS | CONDUCT
force = 5.0

View File

@@ -204,7 +204,7 @@ var/global/list/datum/stack_recipe/phazon_recipes = list()
singular_name = "phazon sheet"
desc = "Holy christ what is this?"
icon_state = "sheet-phazon"
item_state = "sheet-metal"
item_state = "sheet-phazon"
m_amt = 7500
w_type = RECYK_METAL
throwforce = 15.0

View File

@@ -116,7 +116,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
singular_name = "plasteel sheet"
desc = "This sheet is an alloy of iron and plasma."
icon_state = "sheet-plasteel"
item_state = "sheet-metal"
item_state = "sheet-plasteel"
m_amt = 3750 // Was 7500, which doesn't make any fucking sense
throwforce = 15.0
flags = FPRINT | TABLEPASS | CONDUCT

View File

@@ -10,7 +10,7 @@ Refactored AI modules by N3X15
name = "AI Module"
icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
item_state = "electronic"
item_state = "circuitboard"
desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = FPRINT | TABLEPASS| CONDUCT
force = 5.0

View File

@@ -26,6 +26,7 @@
name = "Bag of Holding"
desc = "A backpack that opens into a localized pocket of Blue Space."
origin_tech = "bluespace=4"
item_state = "holdingpack"
icon_state = "holdingpack"
max_w_class = 4
max_combined_w_class = 28
@@ -87,6 +88,7 @@
name = "trophy rack"
desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
icon_state = "cultpack"
item_state = "cultpacknew"
/obj/item/weapon/storage/backpack/clown
name = "Giggles Von Honkerton"

View File

@@ -79,7 +79,7 @@
name = "oxygen deprivation first aid"
desc = "A box full of oxygen goodies."
icon_state = "o2"
item_state = "firstaid-o2"
item_state = "firstaid-oxy"
New()
..()

View File

@@ -146,6 +146,7 @@
name = "emergency nitrogen tank"
desc = "Used for emergencies. Not useful unless you only breathe nitrogen."
icon_state = "emergency_nitrogen"
slot_flags = SLOT_BELT
w_class = 2.0
volume = 2

View File

@@ -2,7 +2,7 @@
name = "hand labeler"
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "labeler0"
item_state = "flight"
item_state = "labeler0"
var/label = null
var/labels_left = 30
var/mode = 0 //off or on.

View File

@@ -99,8 +99,8 @@
name = "camera"
icon = 'icons/obj/items.dmi'
desc = "A polaroid camera."
icon_state = "camera"
item_state = "electropack"
icon_state = "polaroid"
item_state = "polaroid"
w_class = 2.0
flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS
slot_flags = SLOT_BELT

View File

@@ -5,6 +5,7 @@
force = 8.0
throwforce = 15.0
icon_state = "plasmalarge"
item_state = "shard-plasglass"
/obj/item/weapon/shard/plasma/New()

View File

@@ -0,0 +1,5 @@
author: Deity Link
delete-after: true
changes:
- imageadd: over 57 items finally got their in-hand icons. belt too for some.
- experiment: Maracas. Chick-chiky boom, chick-chiky boom.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

View File

@@ -1,23 +1,28 @@
# DMITool Difference Report: D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\cable_stuff.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\cable_stuff.dmi
# DMITool Difference Report: Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\cable_stuff.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\cable_stuff.dmi
+ cuff_cyan
+ cuff_orange
+ cuff_pink
+ cuff_white
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\guns.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\guns.dmi
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\guns.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\guns.dmi
+ scythe0
+ taser100
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\paramedic_eva.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\paramedic_eva.dmi
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\newsprites_lefthand.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\newsprites_lefthand.dmi
+ chapmask
+ honkbook
+ ianism
+ necronomicon
+ shadows
+ torah
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\paramedic_eva.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\paramedic_eva.dmi
+ paramedic-eva
+ paramedic-eva-helmet
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\pcollectorleft.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\pcollectorleft.dmi
+ pcollector_left
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\swords_axes.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\swords_axes.dmi
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\swords_axes.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\swords_axes.dmi
+ axe0
+ axe1
- dualsaber0
@@ -27,11 +32,11 @@
- katana
- scythe0
- unathiknife
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\vox_civvie.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\vox_civvie.dmi
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\vox_civvie.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\vox_civvie.dmi
+ vox-pressure-security
--- D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\left\zz_old_items_lefthand.dmi
+++ D:\Users\chris\Desktop\fuckingbyond\vgstation13\icons\mob\in-hand\right\zz_old_items_lefthand.dmi
--- Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\left\zz_old_items_lefthand.dmi
+++ Y:\Documents\GitHub\vgstation13\icons\mob\in-hand\right\zz_old_items_lefthand.dmi
+ DONGS
+ altair_locket
+ an_tank

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 925 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 874 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 750 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 936 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 569 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 KiB

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 70 KiB