mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Here are the 3 new projectiles that Superxpdude requested.
Bulletburst, weakbulletburst and weakerbulletburst. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1859 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -16,6 +16,14 @@
|
||||
switch(flag)
|
||||
if (PROJECTILE_BULLET)
|
||||
health -= 35
|
||||
if (PROJECTILE_BULLETBURST)
|
||||
health -= 13
|
||||
if (PROJECTILE_WEAKBULLET)
|
||||
health -= 12
|
||||
if (PROJECTILE_WEAKBULLETBURST)
|
||||
health -= 6
|
||||
if (PROJECTILE_WEAKERBULLETBURST)
|
||||
health -= 3
|
||||
if (PROJECTILE_PULSE)
|
||||
health -= 50
|
||||
if (PROJECTILE_LASER)
|
||||
|
||||
@@ -89,8 +89,14 @@
|
||||
switch(flag)
|
||||
if (PROJECTILE_BULLET)
|
||||
health -= 20
|
||||
if (PROJECTILE_BULLETBURST)
|
||||
health -= 7
|
||||
if (PROJECTILE_WEAKBULLET)
|
||||
health -= 4
|
||||
if (PROJECTILE_WEAKBULLETBURST)
|
||||
health -= 2
|
||||
if (PROJECTILE_WEAKERBULLETBURST)
|
||||
health -= 1
|
||||
if (PROJECTILE_LASER)
|
||||
health -= 10
|
||||
if (PROJECTILE_SHOCK)
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
switch(flag)
|
||||
if (PROJECTILE_BULLET)
|
||||
health -= 35
|
||||
if (PROJECTILE_BULLETBURST)
|
||||
health -= 13
|
||||
if (PROJECTILE_PULSE)
|
||||
health -= 50
|
||||
if (PROJECTILE_LASER)
|
||||
|
||||
@@ -21,6 +21,10 @@
|
||||
src.health -= 10
|
||||
src.healthcheck()
|
||||
return
|
||||
if (flag == PROJECTILE_BULLETBURST)
|
||||
src.health -= 4
|
||||
src.healthcheck()
|
||||
return
|
||||
if (flag != PROJECTILE_LASER) //lasers aren't particularly good at breaking glass
|
||||
src.health -= 2
|
||||
src.healthcheck()
|
||||
|
||||
@@ -7,6 +7,9 @@ var/const/PROJECTILE_WEAKBULLET = 6
|
||||
var/const/PROJECTILE_TELEGUN = 7
|
||||
var/const/PROJECTILE_DART = 8
|
||||
var/const/PROJECTILE_SHOCK = 9
|
||||
var/const/PROJECTILE_BULLETBURST = 10
|
||||
var/const/PROJECTILE_WEAKBULLETBURST = 11
|
||||
var/const/PROJECTILE_WEAKERBULLETBURST = 12
|
||||
|
||||
///////////////////////////////////////////////
|
||||
////////////////AMMO SECTION///////////////////
|
||||
@@ -33,10 +36,18 @@ var/const/PROJECTILE_SHOCK = 9
|
||||
|
||||
bumped = 0
|
||||
|
||||
|
||||
weakbullet
|
||||
damage_type = PROJECTILE_WEAKBULLET
|
||||
|
||||
bulletburst
|
||||
damage_type = PROJECTILE_BULLETBURST
|
||||
|
||||
weakbulletburst
|
||||
damage_type = PROJECTILE_WEAKBULLETBURST
|
||||
|
||||
weakerbulletburst
|
||||
damage_type = PROJECTILE_WEAKERBULLETBURST
|
||||
|
||||
beam
|
||||
name = "laser"
|
||||
damage_type = PROJECTILE_LASER
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
src.health -= 10
|
||||
src.healthcheck()
|
||||
return
|
||||
if (flag == PROJECTILE_BULLETBURST)
|
||||
src.health -= 4
|
||||
src.healthcheck()
|
||||
return
|
||||
if (flag != PROJECTILE_LASER) //lasers aren't particularly good at breaking glass
|
||||
src.health -= 2
|
||||
src.healthcheck()
|
||||
|
||||
@@ -136,12 +136,18 @@
|
||||
switch(flag)
|
||||
if(PROJECTILE_BULLET)
|
||||
src.health -= 15
|
||||
if(PROJECTILE_BULLETBURST)
|
||||
src.health -= 6
|
||||
if(PROJECTILE_TASER)
|
||||
src.health -= 5
|
||||
if(PROJECTILE_DART)
|
||||
src.health -= 10
|
||||
if(PROJECTILE_WEAKBULLET)
|
||||
src.health -= 8
|
||||
if(PROJECTILE_WEAKBULLETBURST)
|
||||
src.health -= 4
|
||||
if(PROJECTILE_WEAKERBULLETBURST)
|
||||
src.health -= 2
|
||||
if(PROJECTILE_LASER)
|
||||
src.health -= 10
|
||||
if(PROJECTILE_SHOCK)
|
||||
|
||||
@@ -14,6 +14,22 @@
|
||||
src.density = 0
|
||||
del(src)
|
||||
|
||||
return
|
||||
if (flag == PROJECTILE_BULLETBURST)
|
||||
if(!reinf)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
//SN src = null
|
||||
src.density = 0
|
||||
|
||||
del(src)
|
||||
else
|
||||
health -= 13
|
||||
if(health <=0)
|
||||
new /obj/item/weapon/shard( src.loc )
|
||||
new /obj/item/stack/rods( src.loc )
|
||||
src.density = 0
|
||||
del(src)
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user