cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-23 04:58:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-21 19:03:35 +02:00
parent 89fc57f631 a848dd292d
commit ff7df50a7e
346 changed files with 5621 additions and 4174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/altevian_vr.dm
+2 -2
View File
@@ -10,7 +10,7 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
matter = list(MAT_STEEL = 1000)
projectile_type = /obj/item/projectile/beam/meeplaser
charge_cost = 150
charge_cost = 450
/obj/item/weapon/gun/energy/altevian/large
name = "Proto-Reactive Beam Thruster"
@@ -23,7 +23,7 @@
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 4)
matter = list(MAT_STEEL = 2000)
projectile_type = /obj/item/projectile/beam/meeplaser/strong
charge_cost = 300
charge_cost = 200
/obj/item/projectile/beam/meeplaser
name = "meep beam"
code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm
+2 -2
View File
@@ -182,7 +182,7 @@
if(!QDELING(src) && !holds_charge)
// Put it on a delay because moving item from slot to hand
// calls dropped().
addtimer(CALLBACK(src, .proc/empty_if_not_held), 2)
addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 2)
/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty_if_not_held()
if(!ismob(loc) && !istype(loc, /obj/item/integrated_circuit))
@@ -206,7 +206,7 @@
var/carried = max(1, loc.ConflictElementCount(CONFLICT_ELEMENT_KA))
deltimer(recharge_timerid)
recharge_timerid = addtimer(CALLBACK(src, .proc/reload), recharge_time * carried, TIMER_STOPPABLE)
recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), recharge_time * carried, TIMER_STOPPABLE)
/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
return
code/modules/projectiles/guns/projectile/smartgun.dm
+3 -4
View File
@@ -34,7 +34,7 @@
var/image/I = ..()
if(I)
I.pixel_x = -16
return I
return I
/obj/item/weapon/gun/projectile/smartgun/loaded
magazine_type = /obj/item/ammo_magazine/smartgun
@@ -68,7 +68,7 @@
return
cycling = TRUE
if(closed)
icon_state = "[initial(icon_state)]_open"
playsound(src, 'sound/weapons/smartgunopen.ogg', 75, 0)
@@ -77,7 +77,7 @@
icon_state = "[initial(icon_state)]_closed"
playsound(src, 'sound/weapons/smartgunclose.ogg', 75, 0)
to_chat(user, "<span class='notice'>You ready [src] so that it can be fired.</span>")
addtimer(CALLBACK(src, .proc/toggle_real_state), 2 SECONDS, TIMER_UNIQUE)
addtimer(CALLBACK(src, PROC_REF(toggle_real_state)), 2 SECONDS, TIMER_UNIQUE)
/obj/item/weapon/gun/projectile/smartgun/proc/toggle_real_state()
cycling = FALSE
@@ -147,4 +147,3 @@
max_ammo = 5
ammo_type = /obj/item/ammo_casing/smartgun
multiple_sprites = TRUE