initial port
This commit is contained in:
@@ -567,7 +567,8 @@
|
||||
else if(picking_dropoff_turf)
|
||||
holder.mouse_up_icon = 'icons/effects/mouse_pointers/supplypod_pickturf.dmi' //Icon for when mouse is released
|
||||
holder.mouse_down_icon = 'icons/effects/mouse_pointers/supplypod_pickturf_down.dmi' //Icon for when mouse is pressed
|
||||
holder.mouse_pointer_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released)
|
||||
holder.mouse_override_icon = holder.mouse_up_icon //Icon for idle mouse (same as icon for when released)
|
||||
holder.mouse_pointer_icon = holder.mouse_override_icon
|
||||
holder.click_intercept = src //Create a click_intercept so we know where the user is clicking
|
||||
else
|
||||
var/mob/holder_mob = holder.mob
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
///Contains admin info. Null if client is not an admin.
|
||||
var/datum/admins/holder = null
|
||||
var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc
|
||||
///Time when the click was intercepted
|
||||
var/click_intercept_time = 0
|
||||
var/AI_Interact = 0
|
||||
|
||||
var/jobbancache = null //Used to cache this client's jobbans to save on DB queries
|
||||
@@ -78,6 +80,8 @@
|
||||
//These two vars are used to make a special mouse cursor, with a unique icon for clicking
|
||||
var/mouse_up_icon = null
|
||||
var/mouse_down_icon = null
|
||||
///used to override the mouse cursor so it doesnt get reset
|
||||
var/mouse_override_icon = null
|
||||
|
||||
var/ip_intel = "Disabled"
|
||||
|
||||
|
||||
@@ -422,7 +422,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
|
||||
if( (world.address == address || !address) && !GLOB.host )
|
||||
GLOB.host = key
|
||||
world.update_status()
|
||||
|
||||
|
||||
if(holder)
|
||||
add_admin_verbs()
|
||||
var/admin_memo_note = get_message_output("memo")
|
||||
@@ -867,10 +867,17 @@ 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*/
|
||||
if(!control)
|
||||
return
|
||||
if(click_intercept_time)
|
||||
if(click_intercept_time >= world.time)
|
||||
click_intercept_time = 0 //Reset and return. Next click should work, but not this one.
|
||||
return
|
||||
click_intercept_time = 0 //Just reset. Let's not keep re-checking forever.
|
||||
var/list/L = params2list(params)
|
||||
|
||||
if(L["drag"])
|
||||
|
||||
@@ -875,13 +875,15 @@ 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 (ismecha(loc))
|
||||
if(istype(loc, /obj/vehicle/sealed))
|
||||
var/obj/vehicle/sealed/mecha/M = loc
|
||||
if(M.mouse_pointer)
|
||||
client.mouse_pointer_icon = M.mouse_pointer
|
||||
if(client.mouse_override_icon)
|
||||
client.mouse_pointer_icon = client.mouse_override_icon
|
||||
|
||||
/mob/proc/is_literate()
|
||||
return 0
|
||||
|
||||
@@ -92,7 +92,6 @@
|
||||
/// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun.
|
||||
var/projectile_damage_multiplier = 1
|
||||
|
||||
var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds
|
||||
|
||||
/// directional recoil multiplier
|
||||
var/dir_recoil_amp = 10
|
||||
|
||||
@@ -304,17 +304,21 @@
|
||||
slot_flags = 0
|
||||
mag_type = /obj/item/ammo_box/magazine/mm712x82
|
||||
weapon_weight = WEAPON_HEAVY
|
||||
var/cover_open = FALSE
|
||||
can_suppress = FALSE
|
||||
burst_size = 3
|
||||
burst_shot_delay = 1
|
||||
burst_size = 1
|
||||
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/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)
|
||||
|
||||
@@ -101,8 +101,6 @@
|
||||
slot_flags = null
|
||||
w_class = WEIGHT_CLASS_HUGE
|
||||
custom_materials = null
|
||||
automatic = 0.5
|
||||
fire_delay = 2
|
||||
ammo_type = list(
|
||||
/obj/item/ammo_casing/energy/laser
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user