mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 08:29:57 +01:00
Ports the TG globals controller and converts globals. (#18057)
* SDQL2 update * fix that verb * cl * fix that * toworld * this is pointless * update info * siiiiick.. * vv edit update * fix that * fix editing vars * fix VV * Port the /TG/ globals controller. * part 1 * part 2 * oops * part 3 * Hollow Purple * sadas * bsbsdb * muda na agaki ta * ids 1-15 * 16-31 * 41-75 * bring me back to how things used to be before i lost it all * the strength of mayhem * final touches * cl * protect some vars * update sdql2 to use glob * stuff? * forgot that is not defined there * whoops * observ * but it never gets better * a --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
/obj/item/ammo_casing/proc/expend()
|
||||
. = BB
|
||||
BB = null
|
||||
set_dir(pick(alldirs)) //spin spent casings
|
||||
set_dir(pick(GLOB.alldirs)) //spin spent casings
|
||||
update_icon()
|
||||
|
||||
/obj/item/ammo_casing/attackby(obj/item/W as obj, mob/user as mob)
|
||||
@@ -162,7 +162,7 @@
|
||||
for(var/obj/item/ammo_casing/C in stored_ammo)
|
||||
C.forceMove(user.loc)
|
||||
playsound(C, /singleton/sound_category/casing_drop_sound, 50, FALSE)
|
||||
C.set_dir(pick(alldirs))
|
||||
C.set_dir(pick(GLOB.alldirs))
|
||||
stored_ammo.Cut()
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
S.remove_from_storage(bullet, src)
|
||||
bullet.forceMove(src)
|
||||
ammo += bullet
|
||||
var/image/ammo_picture = image(bullet.icon, bullet.icon_state, dir = pick(alldirs))
|
||||
var/image/ammo_picture = image(bullet.icon, bullet.icon_state, dir = pick(GLOB.alldirs))
|
||||
ammo_picture.pixel_x = rand(-6, 6)
|
||||
ammo_picture.pixel_y = rand(-6, 6)
|
||||
ammo_overlay[bullet] = ammo_picture
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
|
||||
/obj/item/gun/energy/mousegun/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0, var/playemote = 1)
|
||||
var/T = get_turf(user)
|
||||
spark(T, 3, alldirs)
|
||||
spark(T, 3, GLOB.alldirs)
|
||||
..()
|
||||
|
||||
/obj/item/gun/energy/mousegun/emag_act(var/remaining_charges, var/mob/user)
|
||||
|
||||
@@ -488,7 +488,7 @@
|
||||
if(H.mob_size <10)
|
||||
H.visible_message(SPAN_WARNING("\The [src] flies out of \the [H]'s' hand!"), SPAN_WARNING("\The [src] flies out of your hand!"))
|
||||
H.drop_item(src)
|
||||
src.throw_at(get_edge_target_turf(src, reverse_dir[H.dir]), 4, 4)
|
||||
src.throw_at(get_edge_target_turf(src, GLOB.reverse_dir[H.dir]), 4, 4)
|
||||
|
||||
var/obj/item/organ/external/LH = H.get_organ(BP_L_HAND)
|
||||
var/obj/item/organ/external/RH = H.get_organ(BP_R_HAND)
|
||||
|
||||
@@ -85,7 +85,7 @@
|
||||
if(H.mob_size <10)
|
||||
H.visible_message(SPAN_WARNING("\The [src] flies out of \the [H]'s' hand!"), SPAN_WARNING("\The [src] flies out of your hand!"))
|
||||
H.drop_item(src)
|
||||
src.throw_at(get_edge_target_turf(src, reverse_dir[H.dir]), 2, 2)
|
||||
src.throw_at(get_edge_target_turf(src, GLOB.reverse_dir[H.dir]), 2, 2)
|
||||
|
||||
/obj/item/gun/projectile/revolver/detective
|
||||
name = "antique revolver"
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
if(H.mob_size < 10 && !has_online_rig) // smaller than an unathi
|
||||
H.visible_message(SPAN_WARNING("\The [src] goes flying out of \the [H]'s hand!"), SPAN_WARNING("\The [src] flies out of your hand!"))
|
||||
H.drop_item(src)
|
||||
src.throw_at(get_edge_target_turf(src, reverse_dir[H.dir]), 3, 3)
|
||||
src.throw_at(get_edge_target_turf(src, GLOB.reverse_dir[H.dir]), 3, 3)
|
||||
|
||||
var/obj/item/organ/external/LH = H.get_organ(BP_L_HAND)
|
||||
var/obj/item/organ/external/RH = H.get_organ(BP_R_HAND)
|
||||
|
||||
@@ -222,7 +222,7 @@ Pins Below.
|
||||
name = "access-keyed firing pin"
|
||||
desc = "This access locked firing pin allows weapons to be fired only when the user has the required access."
|
||||
fail_message = "<span class='warning'>ACCESS CHECK FAILED.</span>"
|
||||
req_access = list(access_weapons)
|
||||
req_access = list(ACCESS_WEAPONS)
|
||||
|
||||
/obj/item/device/firing_pin/access/pin_auth(mob/living/user)
|
||||
return !allowed(user)
|
||||
|
||||
@@ -263,7 +263,7 @@
|
||||
M.visible_message("<span class='danger'>\The [M] gets fried!</span>")
|
||||
M.color = "#4d4d4d" //get fried
|
||||
M.death()
|
||||
spark(M, 3, alldirs)
|
||||
spark(M, 3, GLOB.alldirs)
|
||||
else if(iscarbon(M) && M.contents.len)
|
||||
for(var/obj/item/holder/H in M.contents)
|
||||
if(!H.contained)
|
||||
@@ -305,7 +305,7 @@
|
||||
if(M.mob_size <= 4 && (M.find_type() & TYPE_ORGANIC))
|
||||
M.visible_message("<span class='danger'>[M] bursts like a balloon!</span>")
|
||||
M.gib()
|
||||
spark(M, 3, alldirs)
|
||||
spark(M, 3, GLOB.alldirs)
|
||||
else if(iscarbon(M) && M.contents.len)
|
||||
for(var/obj/item/holder/H in M.contents)
|
||||
if(!H.contained)
|
||||
|
||||
@@ -495,7 +495,7 @@
|
||||
anti_materiel_potential = 2
|
||||
|
||||
/obj/item/projectile/bullet/nuke/on_impact(var/atom/A)
|
||||
for(var/mob/living/carbon/human/mob in human_mob_list)
|
||||
for(var/mob/living/carbon/human/mob in GLOB.human_mob_list)
|
||||
var/turf/T = get_turf(mob)
|
||||
if(T && (loc.z == T.z))
|
||||
if(ishuman(mob))
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
var/mob/living/new_mob
|
||||
|
||||
var/options = list("robot", "slime")
|
||||
for(var/t in all_species)
|
||||
for(var/t in GLOB.all_species)
|
||||
options += t
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
|
||||
@@ -214,9 +214,9 @@
|
||||
locked = 0
|
||||
update_icon()
|
||||
lock_time = world.time + 35
|
||||
moved_event.register(owner, src, PROC_REF(update_aiming))
|
||||
moved_event.register(aiming_at, src, PROC_REF(target_moved))
|
||||
destroyed_event.register(aiming_at, src, PROC_REF(cancel_aiming))
|
||||
GLOB.moved_event.register(owner, src, PROC_REF(update_aiming))
|
||||
GLOB.moved_event.register(aiming_at, src, PROC_REF(target_moved))
|
||||
GLOB.destroyed_event.register(aiming_at, src, PROC_REF(cancel_aiming))
|
||||
|
||||
/obj/aiming_overlay/proc/aim_cooldown(seconds)
|
||||
aimcooldown = world.time + seconds SECONDS
|
||||
@@ -259,10 +259,10 @@
|
||||
SPAN_NOTICE("You lower \the [aiming_with].")
|
||||
)
|
||||
|
||||
moved_event.unregister(owner, src)
|
||||
GLOB.moved_event.unregister(owner, src)
|
||||
if(aiming_at)
|
||||
moved_event.unregister(aiming_at, src)
|
||||
destroyed_event.unregister(aiming_at, src)
|
||||
GLOB.moved_event.unregister(aiming_at, src)
|
||||
GLOB.destroyed_event.unregister(aiming_at, src)
|
||||
LAZYREMOVE(aiming_at.aimed_at_by, src)
|
||||
aiming_at = null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user