cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Further work on exosuits. Added Marauder combat model.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@516 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
panurgomatic
2010-12-02 09:50:46 +00:00
parent dd97a0e45d
commit 63cd6afce8
8 changed files with 640 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/weapons.dm
+25 -27
View File
@@ -1027,32 +1027,30 @@
del(src)
/obj/beam/a_laser/proc/process()
//world << text("laser at [] []:[], target is [] []:[]", src.loc, src.x, src.y, src:current, src.current:x, src.current:y)
if ((!( src.current ) || src.loc == src.current))
src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z)
//world << text("current changed: target is now []. location was [],[], added [],[]", src.current, src.x, src.y, src.xo, src.yo)
if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy))
//world << text("off-world, deleting")
//SN src = null
del(src)
return
step_towards(src, src.current)
// make it able to hit lying-down folk
var/list/dudes = list()
for(var/mob/living/M in src.loc)
dudes += M
if(dudes.len)
src.Bump(pick(dudes))
//world << text("laser stepped, now [] []:[], target is [] []:[]", src.loc, src.x, src.y, src.current, src.current:x, src.current:y)
src.life--
if (src.life <= 0)
//SN src = null
del(src)
return
spawn(1)
src.process()
return
spawn while(src)
//world << text("laser at [] []:[], target is [] []:[]", src.loc, src.x, src.y, src:current, src.current:x, src.current:y)
if ((!( src.current ) || src.loc == src.current))
src.current = locate(min(max(src.x + src.xo, 1), world.maxx), min(max(src.y + src.yo, 1), world.maxy), src.z)
//world << text("current changed: target is now []. location was [],[], added [],[]", src.current, src.x, src.y, src.xo, src.yo)
if ((src.x == 1 || src.x == world.maxx || src.y == 1 || src.y == world.maxy))
//world << text("off-world, deleting")
//SN src = null
del(src)
return
step_towards(src, src.current)
// make it able to hit lying-down folk
var/list/dudes = list()
for(var/mob/living/M in src.loc)
dudes += M
if(dudes.len)
src.Bump(pick(dudes))
//world << text("laser stepped, now [] []:[], target is [] []:[]", src.loc, src.x, src.y, src.current, src.current:x, src.current:y)
src.life--
if (src.life <= 0)
//SN src = null
del(src)
return
sleep(1)
return
/obj/beam/i_beam/proc/hit()
@@ -1269,4 +1267,4 @@
return ..()
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>The mousetrap is triggered by [A].</B>"), 1)
src.triggered(null)
src.triggered(null)