Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitsunemitsu committed May 8, 2024
1 parent fb2719f commit 461a86e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
8 changes: 4 additions & 4 deletions code/modules/projectiles/guns/ego_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@

if(reloadtime)
switch(reloadtime)
if(1 to 0.7 SECONDS)
if(0 to 0.71 SECONDS)
. += "<span class='notice'>This weapon has a very fast reload.</span>"
if(0.71 SECONDS to 1.2 SECONDS)
if(0.71 SECONDS to 1.21 SECONDS)
. += "<span class='notice'>This weapon has a fast reload.</span>"
if(1.21 SECONDS to 1.7 SECONDS)
if(1.21 SECONDS to 1.71 SECONDS)
. += "<span class='notice'>This weapon has a normal reload speed.</span>"
if(1.71 SECONDS to 2.5 SECONDS)
if(1.71 SECONDS to 2.51 SECONDS)
. += "<span class='notice'>This weapon has a slow reload.</span>"
if(2.51 to INFINITY)
. += "<span class='notice'>This weapon has an extremely slow reload.</span>"
Expand Down
18 changes: 3 additions & 15 deletions code/modules/projectiles/guns/ego_gun/waw.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,28 +162,16 @@
inhand_icon_state = "loyalty"
ammo_type = /obj/item/ammo_casing/caseless/ego_loyalty
weapon_weight = WEAPON_HEAVY
spread = 20
spread = 26
shotsleft = 95
reloadtime = 0.7 SECONDS
special = "This weapon has IFF capabilities. \
Use in hand to turn off IFF."
reloadtime = 3.2 SECONDS
special = "This weapon has IFF capabilities."
fire_sound = 'sound/weapons/gun/smg/vp70.ogg'
autofire = 0.08 SECONDS
attribute_requirements = list(
FORTITUDE_ATTRIBUTE = 80
)

/obj/item/gun/ego_gun/loyalty/attack_self(mob/user)
..()
if(ammo_type == /obj/item/ammo_casing/caseless/ego_loyaltynoiff)
to_chat(user,"<span class='warning'>You hit the switch, enabling IFF and decreasing damage.</span>")
ammo_type = /obj/item/ammo_casing/caseless/ego_loyalty
return
if(ammo_type == /obj/item/ammo_casing/caseless/ego_loyalty)
to_chat(user,"<span class='warning'>You hit the fire selector, disabling IFF and increasing damage.</span>")
ammo_type = /obj/item/ammo_casing/caseless/ego_loyaltynoiff
return

//Just a funny gold soda pistol. It was originally meant to just be a golden meme weapon, now it is the only pale gun, lol
/obj/item/gun/ego_gun/pistol/executive
name = "executive"
Expand Down

0 comments on commit 461a86e

Please sign in to comment.