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

[READY TO MERGE] Exploration Carrier Phase One, Phase Weapon Improvements and new Humvee Vehicle (#6360)

Browse Source 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
This commit is contained in:
Aroliacue
2023-07-31 23:00:03 +10:00
committed by GitHub
parent 97dcd5c3dc
commit 7368ed0071
24 changed files with 96169 additions and 80279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/projectiles/guns/energy/phase.dm
View File

@@ -2,8 +2,8 @@
//CHOMP Edit: Each phase gun now has the same safety lock as frontier phasers. Every pathname now has "locked" and "unlocked", basically. This code comes from /code/modules/projectiles/guns/energy/laser_vr.dm.
/obj/item/weapon/gun/energy/locked/phasegun
name = "phase carbine"
desc = "The RayZar EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
name = "EW26 Artemis" //ChompEDIT
desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market."
icon = 'icons/obj/gun.dmi' // CHOMPEdit: Gun Sprites
icon_state = "phasecarbine"
@@ -16,7 +16,7 @@
recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
/obj/item/weapon/gun/energy/locked/phasegun/unlocked
desc = "The RayZar EW26 Artemis is a downsized energy weapon, specifically designed for use against wildlife."
desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife." //ChompEDIT
req_access = newlist() //for toggling safety
locked = 0
lockable = 0
@@ -31,8 +31,8 @@
recharge_time = 16 //ChompEdit set up to 16 due to lower charge cost
/obj/item/weapon/gun/energy/locked/phasegun/pistol
name = "phase pistol"
desc = "The RayZar EW15 Apollo is an energy handgun, specifically designed for self-defense against aggressive wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
name = "EW15 Apollo" //ChompEDIT
desc = "The RayZar EW15 Apollo, also known as the 'phase pistol', is an energy-based handgun specifically designed for self-defense against aggressive wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
icon_state = "phase"
item_state = "taser" //I don't have an in-hand sprite, taser will be fine
w_class = ITEMSIZE_NORMAL
@@ -43,7 +43,7 @@
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked
desc = "The RayZar EW15 Apollo is an energy handgun, specifically designed for self-defense against aggressive wildlife."
desc = "The RayZar EW15 Apollo, also known as the 'phase pistol', is an energy-based handgun specifically designed for self-defense against aggressive wildlife." //ChompEDIT
req_access = newlist() //for toggling safety
locked = 0
lockable = 0
@@ -59,10 +59,10 @@
/obj/item/weapon/gun/energy/locked/phasegun/rifle
name = "phase rifle"
desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
name = "EW31 Orion" //ChompEDIT
desc = "The RayZar EW31 Orion, also known as the 'phase rifle', is a specialist energy-based weapon intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
icon_state = "phaserifle"
item_state = "phaserifle"
item_state = "phaserifle"
wielded_item_state = "phaserifle-wielded"
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
@@ -72,14 +72,14 @@
one_handed_penalty = 30
/obj/item/weapon/gun/energy/locked/phasegun/rifle/unlocked
desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife."
desc = "The RayZar EW31 Orion, also known as the 'phase rifle', is a specialist energy-based weapon intended for use against hostile wildlife." //ChompEDIT
req_access = newlist() //for toggling safety
locked = 0
lockable = 0
/obj/item/weapon/gun/energy/locked/phasegun/cannon
name = "phase cannon"
desc = "The RayZar EW50 Gaia is a massive energy weapon, purpose-built for clearing land. You feel dirty just looking at it. This one has a safety interlock that prevents firing while in proximity to the facility."
name = "EW50 Gaia" //ChompEDIT
desc = "The RayZar EW50 Gaia, also known as the 'phase cannon', is a massive energy weapon purpose-built for clearing land. You feel dirty just looking at it. This one has a safety interlock that prevents firing while in proximity to the facility." //ChompEDIT
icon_state = "phasecannon"
item_state = "phasecannon"
wielded_item_state = "phasecannon-wielded" //TODO: New Sprites
@@ -91,7 +91,7 @@
one_handed_penalty = 65
/obj/item/weapon/gun/energy/locked/phasegun/cannon/unlocked
desc = "The RayZar EW50 Gaia is a massive energy weapon, purpose-built for clearing land. You feel dirty just looking at it."
desc = "The RayZar EW50 Gaia, also known as the 'phase cannon', is a massive energy weapon purpose-built for clearing land. You feel dirty just looking at it." //ChompEDIT
req_access = newlist() //for toggling safety
locked = 0
lockable = 0

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

@@ -27,7 +27,8 @@
/obj/item/projectile/energy/phase
name = "phase wave"
icon_state = "phase"
range = 13
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecarbine.ogg' //CHOMPedit - New sounds.
range = 13
damage = 5
SA_bonus_damage = 45
armor_penetration = -35
@@ -35,12 +36,14 @@
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/light
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasepistol.ogg' //CHOMPedit - New sounds.
range = 11
SA_bonus_damage = 35
armor_penetration = -50
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy
fire_sound = 'modular_chomp/sound/weapons/phase_new/phaserifle.ogg' //CHOMPedit - New sounds.
range = 16 //Chompedit This range was not great
damage = 10
SA_bonus_damage = 50
@@ -48,6 +51,7 @@
hud_state = "laser_heat"
/obj/item/projectile/energy/phase/heavy/cannon
fire_sound = 'modular_chomp/sound/weapons/phase_new/phasecannon.ogg' //CHOMPedit - New sounds.
range = 20 //Chompedit This range was mediocre, but not worth a cannon.
damage = 15
SA_bonus_damage = 60