cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

squashed commits - ion pistol refactor and away mission emp nerf

Browse Source
This commit is contained in:
Screemonster
2018-02-11 09:27:40 +00:00
parent 9e13e427d6
commit 2cd47f9c80
6 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/organs/internal/organ_internal_vr.dm Normal file
View File

@@ -0,0 +1,11 @@
/obj/item/organ/internal/eyes/emp_act(severity)
if(!(robotic >= ORGAN_ASSISTED))
return
owner.eye_blurry += (4/severity)
/obj/item/organ/internal/cell/emp_act(severity)
owner.nutrition = max(0, owner.nutrition - rand(10/severity, 50/severity))
/obj/item/organ/internal/mmi_holder/emp_act(severity)
owner.adjustToxLoss(rand(6/severity, 12/severity))

5
code/modules/projectiles/guns/energy/special_vr.dm Normal file
View File

@@ -0,0 +1,5 @@
/obj/item/weapon/gun/energy/ionrifle/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
/obj/item/weapon/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small

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

@@ -8,15 +8,17 @@
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/pulse_range = 1 vorestation removal
/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) // vorestation edit
return 1 return 1
/* vorestation removal - moved to vr file
/obj/item/projectile/ion/small /obj/item/projectile/ion/small
pulse_range = 0 pulse_range = 0
*/
/obj/item/projectile/bullet/gyro /obj/item/projectile/bullet/gyro
name ="explosive bolt" name ="explosive bolt"

18
code/modules/projectiles/projectile/special_vr.dm Normal file
View File

@@ -0,0 +1,18 @@
/obj/item/projectile/ion
var/sev1_range = 0
var/sev2_range = 1
var/sev3_range = 1
var/sev4_range = 2
/obj/item/projectile/ion/small
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

2
maps/tether/submaps/alienship/_alienship.dm
View File

@@ -61,7 +61,7 @@
/obj/machinery/porta_turret/alien/ion /obj/machinery/porta_turret/alien/ion
name = "interior anti-boarding turret" name = "interior anti-boarding turret"
desc = "A very tough looking turret made by alien hands." desc = "A very tough looking turret made by alien hands."
installation = /obj/item/weapon/gun/energy/ionrifle/pistol installation = /obj/item/weapon/gun/energy/ionrifle/weak
enabled = TRUE enabled = TRUE
lethal = TRUE lethal = TRUE
ailock = TRUE ailock = TRUE

3
vorestation.dme
View File

@@ -2225,6 +2225,7 @@
#include "code\modules\organs\internal\liver.dm" #include "code\modules\organs\internal\liver.dm"
#include "code\modules\organs\internal\lungs.dm" #include "code\modules\organs\internal\lungs.dm"
#include "code\modules\organs\internal\organ_internal.dm" #include "code\modules\organs\internal\organ_internal.dm"
#include "code\modules\organs\internal\organ_internal_vr.dm"
#include "code\modules\organs\subtypes\diona.dm" #include "code\modules\organs\subtypes\diona.dm"
#include "code\modules\organs\subtypes\machine.dm" #include "code\modules\organs\subtypes\machine.dm"
#include "code\modules\organs\subtypes\seromi.dm" #include "code\modules\organs\subtypes\seromi.dm"
@@ -2350,6 +2351,7 @@
#include "code\modules\projectiles\guns\energy\particle.dm" #include "code\modules\projectiles\guns\energy\particle.dm"
#include "code\modules\projectiles\guns\energy\pulse.dm" #include "code\modules\projectiles\guns\energy\pulse.dm"
#include "code\modules\projectiles\guns\energy\special.dm" #include "code\modules\projectiles\guns\energy\special.dm"
#include "code\modules\projectiles\guns\energy\special_vr.dm"
#include "code\modules\projectiles\guns\energy\stun.dm" #include "code\modules\projectiles\guns\energy\stun.dm"
#include "code\modules\projectiles\guns\energy\stun_vr.dm" #include "code\modules\projectiles\guns\energy\stun_vr.dm"
#include "code\modules\projectiles\guns\energy\temperature.dm" #include "code\modules\projectiles\guns\energy\temperature.dm"
@@ -2384,6 +2386,7 @@
#include "code\modules\projectiles\projectile\force.dm" #include "code\modules\projectiles\projectile\force.dm"
#include "code\modules\projectiles\projectile\magnetic.dm" #include "code\modules\projectiles\projectile\magnetic.dm"
#include "code\modules\projectiles\projectile\special.dm" #include "code\modules\projectiles\projectile\special.dm"
#include "code\modules\projectiles\projectile\special_vr.dm"
#include "code\modules\projectiles\targeting\targeting_client.dm" #include "code\modules\projectiles\targeting\targeting_client.dm"
#include "code\modules\projectiles\targeting\targeting_gun.dm" #include "code\modules\projectiles\targeting\targeting_gun.dm"
#include "code\modules\projectiles\targeting\targeting_mob.dm" #include "code\modules\projectiles\targeting\targeting_mob.dm"