cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes wormhole projectors for pacifists (#43096)

Browse Source 
* Fixes wormhole projectors and gravity manipulators for pacifists

* code cleanup

* didn't mean to push that!

* removes gravgun

* Update code/modules/projectiles/ammunition/energy/portal.dm

Co-Authored-By: ShizCalev <ShizCalev@users.noreply.github.com>
This commit is contained in:
ShizCalev
2019-03-14 15:28:03 -04:00
committed by moo
parent 1d2b97fb1a
commit a26ffb2040
15 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/projectile/beams.dm
View File

@@ -45,7 +45,7 @@
/obj/item/projectile/beam/practice
name = "practice laser"
damage = 0
nodamage = 1
nodamage = TRUE
/obj/item/projectile/beam/scatter
name = "laser pellet"

2
code/modules/projectiles/projectile/energy/ebow.dm
View File

@@ -3,7 +3,7 @@
icon_state = "cbbolt"
damage = 15
damage_type = TOX
nodamage = 0
nodamage = FALSE
stamina = 50
eyeblur = 10
knockdown = 10

4
code/modules/projectiles/projectile/energy/net_snare.dm
View File

@@ -58,7 +58,7 @@
/obj/item/projectile/energy/trap
name = "energy snare"
icon_state = "e_snare"
nodamage = 1
nodamage = TRUE
hitsound = 'sound/weapons/taserhit.ogg'
range = 4
@@ -77,7 +77,7 @@
/obj/item/projectile/energy/trap/cyborg
name = "Energy Bola"
icon_state = "e_snare"
nodamage = 1
nodamage = TRUE
paralyze = 0
hitsound = 'sound/weapons/taserhit.ogg'
range = 10

2
code/modules/projectiles/projectile/energy/stun.dm
View File

@@ -2,7 +2,7 @@
name = "electrode"
icon_state = "spark"
color = "#FFFF00"
nodamage = 1
nodamage = TRUE
paralyze = 100
stutter = 5
jitter = 20

20
code/modules/projectiles/projectile/magic.dm
View File

@@ -3,7 +3,7 @@
icon_state = "energy"
damage = 0
damage_type = OXY
nodamage = 1
nodamage = TRUE
armour_penetration = 100
flag = "magic"
@@ -25,7 +25,7 @@
icon_state = "ion"
damage = 0
damage_type = OXY
nodamage = 1
nodamage = TRUE
/obj/item/projectile/magic/resurrection/on_hit(mob/living/carbon/target)
. = ..()
@@ -104,7 +104,7 @@
icon_state = "energy"
damage = 0
damage_type = OXY
nodamage = 1
nodamage = TRUE
var/list/door_types = list(/obj/structure/mineral_door/wood, /obj/structure/mineral_door/iron, /obj/structure/mineral_door/silver, /obj/structure/mineral_door/gold, /obj/structure/mineral_door/uranium, /obj/structure/mineral_door/sandstone, /obj/structure/mineral_door/transparent/plasma, /obj/structure/mineral_door/transparent/diamond)
/obj/item/projectile/magic/door/on_hit(atom/target)
@@ -133,7 +133,7 @@
icon_state = "ice_1"
damage = 0
damage_type = BURN
nodamage = 1
nodamage = TRUE
/obj/item/projectile/magic/change/on_hit(atom/change)
. = ..()
@@ -292,7 +292,7 @@
icon_state = "red_1"
damage = 0
damage_type = BURN
nodamage = 1
nodamage = TRUE
/obj/item/projectile/magic/animate/on_hit(atom/target, blocked = FALSE)
target.animate_atom_living(firer)
@@ -339,7 +339,7 @@
damage_type = BURN
flag = "magic"
dismemberment = 50
nodamage = 0
nodamage = FALSE
/obj/item/projectile/magic/spellblade/on_hit(target)
if(ismob(target))
@@ -355,7 +355,7 @@
icon_state = "arcane_barrage"
damage = 20
damage_type = BURN
nodamage = 0
nodamage = FALSE
armour_penetration = 0
flag = "magic"
hitsound = 'sound/weapons/barragespellhit.ogg'
@@ -606,7 +606,7 @@
icon_state = "tesla_projectile" //Better sprites are REALLY needed and appreciated!~
damage = 15
damage_type = BURN
nodamage = 0
nodamage = FALSE
speed = 0.3
flag = "magic"
@@ -641,7 +641,7 @@
icon_state = "fireball"
damage = 10
damage_type = BRUTE
nodamage = 0
nodamage = FALSE
//explosion values
var/exp_heavy = 0
@@ -684,7 +684,7 @@
icon_state = "ice_2"
damage = 0
damage_type = BURN
nodamage = 1
nodamage = TRUE
armour_penetration = 100
temperature = 50
flag = "magic"

4
code/modules/projectiles/projectile/special/floral.dm
View File

@@ -3,7 +3,7 @@
icon_state = "energy"
damage = 0
damage_type = TOX
nodamage = 1
nodamage = TRUE
flag = "energy"
/obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = FALSE)
@@ -21,5 +21,5 @@
icon_state = "energy2"
damage = 0
damage_type = TOX
nodamage = 1
nodamage = TRUE
flag = "energy"

6
code/modules/projectiles/projectile/special/gravity.dm
View File

@@ -5,7 +5,7 @@
hitsound = 'sound/weapons/wave.ogg'
damage = 0
damage_type = BRUTE
nodamage = 1
nodamage = TRUE
color = "#33CCFF"
var/turf/T
var/power = 4
@@ -40,7 +40,7 @@
hitsound = 'sound/weapons/wave.ogg'
damage = 0
damage_type = BRUTE
nodamage = 1
nodamage = TRUE
color = "#FF6600"
var/turf/T
var/power = 4
@@ -74,7 +74,7 @@
hitsound = 'sound/weapons/wave.ogg'
damage = 0
damage_type = BRUTE
nodamage = 1
nodamage = TRUE
color = "#101010"
var/turf/T
var/power = 4

2
code/modules/projectiles/projectile/special/ion.dm
View File

@@ -3,7 +3,7 @@
icon_state = "ion"
damage = 0
damage_type = BURN
nodamage = 1
nodamage = TRUE
flag = "energy"
impact_effect_type = /obj/effect/temp_visual/impact_effect/ion

2
code/modules/projectiles/projectile/special/meteor.dm
View File

@@ -4,7 +4,7 @@
icon_state = "small1"
damage = 0
damage_type = BRUTE
nodamage = 1
nodamage = TRUE
flag = "bullet"
/obj/item/projectile/meteor/Bump(atom/A)