cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports Vorestation's emp effects and ion projectiles (#4818)

Browse Source
This commit is contained in:
Anewbe
2018-02-15 14:29:33 -06:00
committed by Atermonera
parent f5dfbff1bd
commit a93cb256ec
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/internal/eyes.dm
View File

@@ -93,3 +93,7 @@
/obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity) /obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
return -1 return -1
/obj/item/organ/internal/eyes/emp_act(severity)
..() //Returns if the organ isn't robotic
owner.eye_blurry += (4/severity)

7
code/modules/organs/subtypes/machine.dm
View File

@@ -17,6 +17,9 @@
owner.stat = 0 owner.stat = 0
owner.visible_message("<span class='danger'>\The [owner] twitches visibly!</span>") owner.visible_message("<span class='danger'>\The [owner] twitches visibly!</span>")
/obj/item/organ/internal/cell/emp_act(severity)
..()
owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
// Used for an MMI or posibrain being installed into a human. // Used for an MMI or posibrain being installed into a human.
/obj/item/organ/internal/mmi_holder /obj/item/organ/internal/mmi_holder
@@ -83,6 +86,10 @@
holder_mob.drop_from_inventory(src) holder_mob.drop_from_inventory(src)
qdel(src) qdel(src)
/obj/item/organ/internal/mmi_holder/emp_act(severity)
..()
owner.adjustToxLoss(rand(6/severity, 12/severity))
/obj/item/organ/internal/mmi_holder/posibrain /obj/item/organ/internal/mmi_holder/posibrain
name = "positronic brain interface" name = "positronic brain interface"
brain_type = /obj/item/device/mmi/digital/posibrain brain_type = /obj/item/device/mmi/digital/posibrain

2
code/modules/projectiles/guns/energy/special.dm
View File

@@ -22,7 +22,7 @@
force = 5 force = 5
slot_flags = SLOT_BELT|SLOT_HOLSTER slot_flags = SLOT_BELT|SLOT_HOLSTER
charge_cost = 480 charge_cost = 480
projectile_type = /obj/item/projectile/ion projectile_type = /obj/item/projectile/ion/pistol
/obj/item/weapon/gun/energy/phasegun /obj/item/weapon/gun/energy/phasegun
name = "phase pistol" name = "phase pistol"

19
code/modules/projectiles/projectile/special.dm
View File

@@ -9,15 +9,26 @@
light_range = 2 light_range = 2
light_power = 0.5 light_power = 0.5
light_color = "#55AAFF" light_color = "#55AAFF"
var/pulse_range = 1 var/sev1_range = 0
var/sev2_range = 1
var/sev3_range = 1
var/sev4_range = 2
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0) /obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
empulse(target, pulse_range, pulse_range, pulse_range, pulse_range) empulse(target, sev1_range, sev2_range, sev3_range, sev4_range)
return 1 return 1
/obj/item/projectile/ion/small /obj/item/projectile/ion/small
pulse_range = 0 sev1_range = -1
sev2_range = 0
sev3_range = 0
sev4_range = 1
/obj/item/projectile/ion/pistol
sev1_range = 0
sev2_range = 0
sev3_range = 0
sev4_range = 0
/obj/item/projectile/bullet/gyro /obj/item/projectile/bullet/gyro
name ="explosive bolt" name ="explosive bolt"