summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-05-06 17:49:37 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-05-06 17:49:37 -0400
commit6074bf4450a35ff60fb68d104db8aba58d8c4de9 (patch)
tree1ffc32aaac5624aa126202395213e439c6213bbc
parent444d155bcc28d1a4be11ef116905458bff3f0255 (diff)
downloadgmstranded-6074bf4450a35ff60fb68d104db8aba58d8c4de9.tar.gz
gmstranded-6074bf4450a35ff60fb68d104db8aba58d8c4de9.tar.bz2
gmstranded-6074bf4450a35ff60fb68d104db8aba58d8c4de9.zip
Added all gun chunk icons
-rw-r--r--content/materials/items/weaponparts/Copper_Gunbarrel.pngbin0 -> 502 bytes
-rw-r--r--content/materials/items/weaponparts/Copper_Gungrip.pngbin0 -> 597 bytes
-rw-r--r--content/materials/items/weaponparts/Copper_Gunmagazine.pngbin0 -> 456 bytes
-rw-r--r--content/materials/items/weaponparts/Copper_Gunslide.pngbin0 -> 3278 bytes
-rw-r--r--content/materials/items/weaponparts/Copper_Reflex_Scope.pngbin0 -> 413 bytes
-rw-r--r--content/materials/items/weaponparts/Copper_Weapon_Scope.pngbin0 -> 476 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Gunbarrel.pngbin0 -> 481 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Gungrip.pngbin0 -> 579 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Gunmagazine.pngbin0 -> 445 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Gunslide.pngbin0 -> 2955 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Reflex_Scope.pngbin0 -> 398 bytes
-rw-r--r--content/materials/items/weaponparts/Gold_Weapon_Scope.pngbin0 -> 473 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Gunbarrel.pngbin0 -> 472 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Gungrip.pngbin0 -> 578 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Gunmagazine.pngbin0 -> 435 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Gunslide.pngbin0 -> 2937 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Reflex_Scope.pngbin0 -> 422 bytes
-rw-r--r--content/materials/items/weaponparts/Iron_Weapon_Scope.pngbin0 -> 476 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Gunbarrel.pngbin0 -> 503 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Gungrip.pngbin0 -> 609 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Gunmagazine.pngbin0 -> 450 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Gunslide.pngbin0 -> 3375 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Reflex_Scope.pngbin0 -> 449 bytes
-rw-r--r--content/materials/items/weaponparts/Platinum_Weapon_Scope.pngbin0 -> 492 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Gunbarrel.pngbin0 -> 416 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Gungrip.pngbin0 -> 580 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Gunmagazine.pngbin0 -> 421 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Gunslide.pngbin0 -> 1904 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Reflex_Scope.pngbin0 -> 372 bytes
-rw-r--r--content/materials/items/weaponparts/Silver_Weapon_Scope.pngbin0 -> 429 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Gunbarrel.pngbin0 -> 493 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Gungrip.pngbin0 -> 580 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Gunmagazine.pngbin0 -> 430 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Gunslide.pngbin0 -> 3458 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Reflex_Scope.pngbin0 -> 419 bytes
-rw-r--r--content/materials/items/weaponparts/Steel_Weapon_Scope.pngbin0 -> 456 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Gunbarrel.pngbin0 -> 1479 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Gungrip.pngbin0 -> 1793 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Gunmagazine.pngbin0 -> 1166 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Gunslide.pngbin0 -> 3630 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Reflex_Scope.pngbin0 -> 812 bytes
-rw-r--r--content/materials/items/weaponparts/Tech_Weapon_Scope.pngbin0 -> 1123 bytes
-rw-r--r--entities/entities/gms_bed.lua9
-rw-r--r--entities/entities/gms_campfire.lua23
-rw-r--r--gamemode/itemsystem/items/gunchunks.lua19
45 files changed, 16 insertions, 35 deletions
diff --git a/content/materials/items/weaponparts/Copper_Gunbarrel.png b/content/materials/items/weaponparts/Copper_Gunbarrel.png
new file mode 100644
index 0000000..86dc923
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Copper_Gungrip.png b/content/materials/items/weaponparts/Copper_Gungrip.png
new file mode 100644
index 0000000..7819c01
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Copper_Gunmagazine.png b/content/materials/items/weaponparts/Copper_Gunmagazine.png
new file mode 100644
index 0000000..3740830
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Copper_Gunslide.png b/content/materials/items/weaponparts/Copper_Gunslide.png
new file mode 100644
index 0000000..766c57a
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Copper_Reflex_Scope.png b/content/materials/items/weaponparts/Copper_Reflex_Scope.png
new file mode 100644
index 0000000..fa90f4d
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Copper_Weapon_Scope.png b/content/materials/items/weaponparts/Copper_Weapon_Scope.png
new file mode 100644
index 0000000..eae7e55
--- /dev/null
+++ b/content/materials/items/weaponparts/Copper_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Gunbarrel.png b/content/materials/items/weaponparts/Gold_Gunbarrel.png
new file mode 100644
index 0000000..3b9075b
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Gungrip.png b/content/materials/items/weaponparts/Gold_Gungrip.png
new file mode 100644
index 0000000..8c68730
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Gunmagazine.png b/content/materials/items/weaponparts/Gold_Gunmagazine.png
new file mode 100644
index 0000000..0d26279
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Gunslide.png b/content/materials/items/weaponparts/Gold_Gunslide.png
new file mode 100644
index 0000000..2ada887
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Reflex_Scope.png b/content/materials/items/weaponparts/Gold_Reflex_Scope.png
new file mode 100644
index 0000000..25e7114
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Gold_Weapon_Scope.png b/content/materials/items/weaponparts/Gold_Weapon_Scope.png
new file mode 100644
index 0000000..7bf2f3d
--- /dev/null
+++ b/content/materials/items/weaponparts/Gold_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Gunbarrel.png b/content/materials/items/weaponparts/Iron_Gunbarrel.png
new file mode 100644
index 0000000..aa8cf6a
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Gungrip.png b/content/materials/items/weaponparts/Iron_Gungrip.png
new file mode 100644
index 0000000..7c97a18
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Gunmagazine.png b/content/materials/items/weaponparts/Iron_Gunmagazine.png
new file mode 100644
index 0000000..3923658
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Gunslide.png b/content/materials/items/weaponparts/Iron_Gunslide.png
new file mode 100644
index 0000000..4a8c040
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Reflex_Scope.png b/content/materials/items/weaponparts/Iron_Reflex_Scope.png
new file mode 100644
index 0000000..64522c6
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Iron_Weapon_Scope.png b/content/materials/items/weaponparts/Iron_Weapon_Scope.png
new file mode 100644
index 0000000..cb2702c
--- /dev/null
+++ b/content/materials/items/weaponparts/Iron_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Gunbarrel.png b/content/materials/items/weaponparts/Platinum_Gunbarrel.png
new file mode 100644
index 0000000..55acc5f
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Gungrip.png b/content/materials/items/weaponparts/Platinum_Gungrip.png
new file mode 100644
index 0000000..6760351
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Gunmagazine.png b/content/materials/items/weaponparts/Platinum_Gunmagazine.png
new file mode 100644
index 0000000..49eb5aa
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Gunslide.png b/content/materials/items/weaponparts/Platinum_Gunslide.png
new file mode 100644
index 0000000..052653e
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Reflex_Scope.png b/content/materials/items/weaponparts/Platinum_Reflex_Scope.png
new file mode 100644
index 0000000..76ba3fb
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Platinum_Weapon_Scope.png b/content/materials/items/weaponparts/Platinum_Weapon_Scope.png
new file mode 100644
index 0000000..007233d
--- /dev/null
+++ b/content/materials/items/weaponparts/Platinum_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Gunbarrel.png b/content/materials/items/weaponparts/Silver_Gunbarrel.png
new file mode 100644
index 0000000..182a0af
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Gungrip.png b/content/materials/items/weaponparts/Silver_Gungrip.png
new file mode 100644
index 0000000..186e88f
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Gunmagazine.png b/content/materials/items/weaponparts/Silver_Gunmagazine.png
new file mode 100644
index 0000000..c85ef4c
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Gunslide.png b/content/materials/items/weaponparts/Silver_Gunslide.png
new file mode 100644
index 0000000..26837f9
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Reflex_Scope.png b/content/materials/items/weaponparts/Silver_Reflex_Scope.png
new file mode 100644
index 0000000..e06070f
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Silver_Weapon_Scope.png b/content/materials/items/weaponparts/Silver_Weapon_Scope.png
new file mode 100644
index 0000000..05ac0a3
--- /dev/null
+++ b/content/materials/items/weaponparts/Silver_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Gunbarrel.png b/content/materials/items/weaponparts/Steel_Gunbarrel.png
new file mode 100644
index 0000000..6ab61f1
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Gungrip.png b/content/materials/items/weaponparts/Steel_Gungrip.png
new file mode 100644
index 0000000..807da49
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Gunmagazine.png b/content/materials/items/weaponparts/Steel_Gunmagazine.png
new file mode 100644
index 0000000..2456250
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Gunslide.png b/content/materials/items/weaponparts/Steel_Gunslide.png
new file mode 100644
index 0000000..9999ad3
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Reflex_Scope.png b/content/materials/items/weaponparts/Steel_Reflex_Scope.png
new file mode 100644
index 0000000..5114d83
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Steel_Weapon_Scope.png b/content/materials/items/weaponparts/Steel_Weapon_Scope.png
new file mode 100644
index 0000000..6fcd5c1
--- /dev/null
+++ b/content/materials/items/weaponparts/Steel_Weapon_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Gunbarrel.png b/content/materials/items/weaponparts/Tech_Gunbarrel.png
new file mode 100644
index 0000000..52f2173
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Gunbarrel.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Gungrip.png b/content/materials/items/weaponparts/Tech_Gungrip.png
new file mode 100644
index 0000000..02f9db7
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Gungrip.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Gunmagazine.png b/content/materials/items/weaponparts/Tech_Gunmagazine.png
new file mode 100644
index 0000000..c8ef050
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Gunmagazine.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Gunslide.png b/content/materials/items/weaponparts/Tech_Gunslide.png
new file mode 100644
index 0000000..4c3a8a3
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Gunslide.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Reflex_Scope.png b/content/materials/items/weaponparts/Tech_Reflex_Scope.png
new file mode 100644
index 0000000..486eb24
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Reflex_Scope.png
Binary files differ
diff --git a/content/materials/items/weaponparts/Tech_Weapon_Scope.png b/content/materials/items/weaponparts/Tech_Weapon_Scope.png
new file mode 100644
index 0000000..fb49725
--- /dev/null
+++ b/content/materials/items/weaponparts/Tech_Weapon_Scope.png
Binary files differ
diff --git a/entities/entities/gms_bed.lua b/entities/entities/gms_bed.lua
index 7b7a87b..21723e7 100644
--- a/entities/entities/gms_bed.lua
+++ b/entities/entities/gms_bed.lua
@@ -1,7 +1,3 @@
---[[
-A useful command for createing structures.
-lua_run for k,v in pairs(ents.GetAll()) do if(v:GetClass() == "prop_physics") then print(v:GetModel()) print(v:GetPos()) print(v:GetAngles()) end end
-]]
AddCSLuaFile()
--[[
Some lua_run functions useful for finding props
@@ -38,21 +34,25 @@ ENT.VisParts = {
"models/props_c17/gravestone001a.mdl",
Vector(3.3, 1.5, -4.8),
Angle(-90,90,180),
+ "Models/Gibs/furniture_gibs/FurnitureWoodDrawers001a",
},
{
"models/props_c17/gravestone001a.mdl",
Vector(3.6, 2.5, -5),
Angle(-90, -90, 180),
+ "Models/Gibs/furniture_gibs/FurnitureWoodDrawers001a",
},
{
"models/props_c17/canister01a.mdl",
Vector(17.5, -41.6, -5),
Angle(0, 90, 180),
+ "models/props_debris/metalwall001a",
},
{
"models/props_c17/canister01a.mdl",
Vector(-12, -41.6, -5),
Angle(0, 90, -180),
+ "models/props_debris/metalwall001a",
},
{
"models/props_c17/playground_teetertoter_stan.mdl",
@@ -73,6 +73,7 @@ function ENT:OnInitialize()
e:SetModel(v[1])
e:SetPos(v[2] + self:GetPos())
e:SetAngles(v[3])
+ if(v[4] != nil) then e:SetMaterial(v[4]) end
e:Spawn()
e:SetParent(self)
self.Props[k] = e
diff --git a/entities/entities/gms_campfire.lua b/entities/entities/gms_campfire.lua
index 776cfbc..3e6c877 100644
--- a/entities/entities/gms_campfire.lua
+++ b/entities/entities/gms_campfire.lua
@@ -35,30 +35,7 @@ ENT.VisParts = {
Angle(68.427, 118.366, 9.406),
},
}
---[[
-models/props_debris/wood_chunk08b.mdl
-1.240417 5.524837 -7.739258
--89.377 -65.131 -82.987
-models/props_debris/wood_chunk06d.mdl
--0.861053 -7.099247 -3.869141
--68.427 -61.634 -141.252
-models/props_debris/wood_chunk02a.mdl
--3.136078 11.640522 -3.352539
--62.440 122.254 1.722
-models/props_debris/wood_chunk04d.mdl
--12.100769 3.301933 -0.352539
--45.086 67.079 -161.642
-models/props_debris/wood_chunk02b.mdl
--1.157349 -9.414154 -2.000000
-68.427 118.366 9.406
-models/hunter/blocks/cube1x1x05.mdl
-0.000000 0.000000 0.000000
-0.010 -45.169 0.018
-models/props_debris/wood_chunk04d.mdl
-3.393311 17.393948 -3.345703
-58.830 -82.344 13.865
-]]
function ENT:OnInitialize()
self:SetModel( self.Model )
self:PhysicsInit( SOLID_VPHYSICS )
diff --git a/gamemode/itemsystem/items/gunchunks.lua b/gamemode/itemsystem/items/gunchunks.lua
index 9e1c157..412ae68 100644
--- a/gamemode/itemsystem/items/gunchunks.lua
+++ b/gamemode/itemsystem/items/gunchunks.lua
@@ -10,20 +10,23 @@ local materials = {
}
local gunparts = {
- {"Gunslide","test.png"},
- {"Gunbarrel","test.png"},
- {"Gungrip", "test.png"},
- {"Gunmagazine", "test.png"},
- {"Weapon Scope", "test.png"},
- {"Reflex Scope", "test.png"},
+ "Gunslide",
+ "Gunbarrel",
+ "Gungrip",
+ "Gunmagazine",
+ "Weapon Scope",
+ "Reflex Scope",
}
for k,v in pairs(materials) do
for i,j in pairs(gunparts) do
local ITEM = {}
- ITEM.Name = v .. " " .. j[1]
+ ITEM.Name = v .. " " .. j
ITEM.Description = "A part of a weapon!"
- ITEM.Icon = j[2]
+ local filename = string.Replace(v .. " " .. j," ","_")
+ local directory = "items/weaponparts/" .. filename .. ".png"
+ print("File for " .. ITEM.Name .. " is " .. directory)
+ ITEM.Icon = directory
ITEM.UniqueData = false
genericMakeDroppable(ITEM)
GMS.RegisterResource(ITEM)