this gets it to the point it compiles

This commit is contained in:
shellspeed1
2022-09-09 18:04:52 -07:00
parent defbd507ba
commit f2ed6a571c
8 changed files with 107 additions and 40 deletions

View File

@@ -867,10 +867,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
ip_intel = res.intel
/client/Click(atom/object, atom/location, control, params, ignore_spam = FALSE, extra_info)
/*if(last_click > world.time - world.tick_lag)
if(last_click > world.time - world.tick_lag)
return
last_activity = world.time
last_click = world.time*/
last_click = world.time
//fullauto stuff
if(!control)
return
if(click_intercept_time)

View File

@@ -875,13 +875,13 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
L.alpha = lighting_alpha
/mob/proc/update_mouse_pointer()
if(!client)
if (!client)
return
client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
if(istype(loc, /obj/vehicle/sealed))
var/obj/vehicle/sealed/mecha/M = loc
if(M.mouse_pointer)
client.mouse_pointer_icon = M.mouse_pointer
var/obj/vehicle/sealed/mecha/E = loc
if(E.mouse_pointer)
client.mouse_pointer_icon = E.mouse_pointer
if(client.mouse_override_icon)
client.mouse_pointer_icon = client.mouse_override_icon

View File

@@ -57,6 +57,8 @@
var/burst_spread = 0 //Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
var/inaccuracy_modifier = 1
var/semicd = 0 //cooldown handler
var/dual_wield_spread = 24 //additional spread when dual wielding
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'

View File

@@ -15,6 +15,11 @@
fire_sound = "sound/weapons/gunshot_smg_alt.ogg"
mag_type = /obj/item/ammo_box/magazine/smgm9mm
pin = null
burst_size = 1
/obj/item/gun/ballistic/automatic/proto/Initialize()
. = ..()
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
/obj/item/gun/ballistic/automatic/proto/unrestricted
pin = /obj/item/firing_pin
@@ -309,16 +314,15 @@
actions_types = list()
spread = 7
pin = /obj/item/firing_pin/implant/pindicate
automatic_burst_overlay = FALSE
var/cover_open = FALSE
/obj/item/gun/ballistic/automatic/l6_saw/Initialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
/obj/item/gun/ballistic/automatic/l6_saw/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/automatic/l6_saw/ComponentInitialize()
. = ..()
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS)
/obj/item/gun/ballistic/automatic/l6_saw/examine(mob/user)
. = ..()
if(cover_open && magazine)