aboutsummaryrefslogtreecommitdiff
path: root/entities
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-10-21 22:51:41 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-10-21 22:51:41 -0400
commit50537786ae45d0e12a1dc4265e0d40d2fd4fbc4b (patch)
treea75d44f275eeee4464570b0b3d238244830fcaf1 /entities
parent82bcf2c8e3c64fb06bd0094ab5d889bd15a4948a (diff)
parentb0169e7ca20fd9fa4ae889af8fff16d2bf638a18 (diff)
downloadwintersurvival2-50537786ae45d0e12a1dc4265e0d40d2fd4fbc4b.tar.gz
wintersurvival2-50537786ae45d0e12a1dc4265e0d40d2fd4fbc4b.tar.bz2
wintersurvival2-50537786ae45d0e12a1dc4265e0d40d2fd4fbc4b.zip
Various bugfixes and updates, gamemode should be playable again
Diffstat (limited to 'entities')
-rw-r--r--entities/entities/ws_projectile/init.lua1
-rw-r--r--entities/entities/ws_researchtable/init.lua4
2 files changed, 2 insertions, 3 deletions
diff --git a/entities/entities/ws_projectile/init.lua b/entities/entities/ws_projectile/init.lua
index 081642d..0a18b1a 100644
--- a/entities/entities/ws_projectile/init.lua
+++ b/entities/entities/ws_projectile/init.lua
@@ -27,6 +27,5 @@ end
function ENT:Think()
--print("speed is " .. self.speed)
- self:GetPhysicsObject():ApplyForceCenter((self:GetForward() * self.speed) + ( Vector(0,0,-1) * self.drop))
self:GetPhysicsObject():SetAngles(self:GetVelocity():Angle())
end
diff --git a/entities/entities/ws_researchtable/init.lua b/entities/entities/ws_researchtable/init.lua
index 3fc4233..1a3a07b 100644
--- a/entities/entities/ws_researchtable/init.lua
+++ b/entities/entities/ws_researchtable/init.lua
@@ -1,7 +1,7 @@
AddCSLuaFile("cl_init.lua")
AddCSLuaFile("shared.lua")
-include('shared.lua')
+include("shared.lua")
--[[An item to give hints to players that are just starting out]]
local PossibleRecipies = {
@@ -41,7 +41,7 @@ function ENT:Think()
end
for k,v in pairs(player.GetAll()) do
if (v:Alive() and v:GetPos():Distance(self:GetPos()) < 200) then
- v:ChatPrint("Perhaps you can make a " .. randomrecipie[0] .. " with " .. randomrecipie[1])
+ v:ChatPrint("Perhaps you can make a " .. randomrecipie[1] .. " with " .. randomrecipie[2])
end
end