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

Here are the 3 new projectiles that Superxpdude requested.

Browse Source 
Bulletburst, weakbulletburst and weakerbulletburst.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1859 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-15 19:04:33 +00:00
parent aafab0fbb2
commit 29aeddee41
28 changed files with 403 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/theblob.dm
+3
View File
@@ -104,6 +104,9 @@
if (flag == PROJECTILE_BULLET)
health -= 10
update()
if (flag == PROJECTILE_BULLETBURST)
health -= 4
update()
else if (flag == PROJECTILE_BOLT)
poisoned(1)
else
code/game/gamemodes/events/ninja_equipment.dm
+2
View File
@@ -1384,6 +1384,8 @@ It is possible to destroy the net by the occupant or someone else.
switch(flag)
if (PROJECTILE_BULLET)
health -= 35
if (PROJECTILE_BULLETBURST)
health -= 13
if (PROJECTILE_PULSE)
health -= 50
if (PROJECTILE_LASER)
code/game/machinery/bots/bots.dm
+2
View File
@@ -77,6 +77,8 @@
switch(flag)
if (PROJECTILE_BULLET)
src.health -= 20
if (PROJECTILE_BULLETBURST)
src.health -= 8
//if (PROJECTILE_WEAKBULLET || PROJECTILE_BEANBAG) //Detective's revolver fires marshmallows
// src.health -= 2
if (PROJECTILE_LASER)
code/game/machinery/portable_turret.dm
+2
View File
@@ -236,6 +236,8 @@ Neutralize All Unidentified Life Signs: []<BR>"},
// handles how much damage each type of projectile deals
if (flag == PROJECTILE_BULLET)
src.health -= 5
else if (flag == PROJECTILE_BULLETBURST)
src.health -= 2
else if (flag == PROJECTILE_TASER)
src.health -= 1
else if(flag == PROJECTILE_PULSE)
code/game/machinery/shieldgen.dm
+12
View File
@@ -381,8 +381,14 @@
switch(flag)
if (PROJECTILE_BULLET)
src.storedpower -= 10
if (PROJECTILE_BULLETBURST)
src.storedpower -= 4
if (PROJECTILE_WEAKBULLET)
src.storedpower -= 1
if (PROJECTILE_WEAKBULLETBURST)
src.storedpower -= 1
if (PROJECTILE_WEAKERBULLETBURST)
src.storedpower -= 0.5
if (PROJECTILE_LASER)
src.storedpower +=20
if (PROJECTILE_SHOCK)
@@ -511,8 +517,14 @@
switch(flag)
if (PROJECTILE_BULLET)
G.storedpower -= 10
if (PROJECTILE_BULLETBURST)
G.storedpower -= 4
if (PROJECTILE_WEAKBULLET)
G.storedpower -=1
if (PROJECTILE_WEAKBULLETBURST)
G.storedpower -=1
if (PROJECTILE_WEAKERBULLETBURST)
G.storedpower -=0.5
if (PROJECTILE_LASER)
G.storedpower +=20
if (PROJECTILE_SHOCK)
code/game/machinery/turrets.dm
+8
View File
@@ -231,6 +231,8 @@
/obj/machinery/turret/bullet_act(flag)
if (flag == PROJECTILE_BULLET)
src.health -= 17
else if (flag == PROJECTILE_BULLETBURST)
src.health -= 7
else if (flag == PROJECTILE_TASER) //taser
src.health -= 1
else if(flag == PROJECTILE_PULSE)
@@ -444,8 +446,14 @@
damage = 8
if(PROJECTILE_WEAKBULLET)
damage = 8
if(PROJECTILE_WEAKBULLETBURST)
damage = 4
if(PROJECTILE_WEAKERBULLETBURST)
damage = 2
if(PROJECTILE_BULLET)
damage = 10
if(PROJECTILE_BULLETBURST)
damage = 4
if(PROJECTILE_BOLT)
damage = 5
if(PROJECTILE_DART)
code/game/magic/magicmonster.dm
+6
View File
@@ -78,8 +78,14 @@
bullet_act(flag, A as obj)
if (flag == PROJECTILE_BULLET)
src.health -= 20
else if (flag == PROJECTILE_BULLETBURST)
src.health -= 8
else if (flag == PROJECTILE_WEAKBULLET)
src.health -= 4
else if (flag == PROJECTILE_WEAKBULLETBURST)
src.health -= 2
else if (flag == PROJECTILE_WEAKERBULLETBURST)
src.health -= 1
else if (flag == PROJECTILE_LASER)
src.health -= 10
else if (flag == PROJECTILE_SHOCK)
code/game/mecha/equipment/tools/tools.dm
+6
View File
@@ -484,8 +484,14 @@
damage = 25
if(PROJECTILE_WEAKBULLET)
damage = 8
if(PROJECTILE_WEAKBULLETBURST)
damage = 4
if(PROJECTILE_WEAKERBULLETBURST)
damage = 2
if(PROJECTILE_BULLET)
damage = 10
if(PROJECTILE_BULLETBURST)
damage = 4
if(PROJECTILE_BOLT)
damage = 5
if(PROJECTILE_DART)
code/game/mecha/mecha.dm
+6
View File
@@ -409,8 +409,14 @@
use_power(500)
if(PROJECTILE_WEAKBULLET)
damage = 8
if(PROJECTILE_WEAKBULLETBURST)
damage = 4
if(PROJECTILE_WEAKERBULLETBURST)
damage = 2
if(PROJECTILE_BULLET)
damage = 10
if(PROJECTILE_BULLETBURST)
damage = 4
if(PROJECTILE_BOLT)
damage = 5
if(PROJECTILE_DART)
code/game/objects/alien/egg.dm
+8
View File
@@ -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)
code/game/objects/alien/facehugger.dm
+6
View File
@@ -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)
code/game/objects/alien/resin.dm
+2
View File
@@ -21,6 +21,8 @@
switch(flag)
if (PROJECTILE_BULLET)
health -= 35
if (PROJECTILE_BULLETBURST)
health -= 13
if (PROJECTILE_PULSE)
health -= 50
if (PROJECTILE_LASER)
code/game/objects/displaycase.dm
+4
View File
@@ -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()
code/game/objects/items/weapons/guns_new.dm
+12 -1
View File
@@ -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
code/game/objects/lamarr.dm
+4
View File
@@ -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()
code/game/objects/livestock.dm
+6
View File
@@ -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)
code/game/objects/window.dm
+16
View File
@@ -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