cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made special object instead of using blindscreen

Browse Source 
Made special object instead of using blindscreen
This commit is contained in:
Razharas
2015-06-06 07:10:46 +03:00
parent 20c586b9e1
commit cdc32a50c3
14 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+17
View File
@@ -309,3 +309,20 @@
else
if(dx > 0) dir = EAST
else dir = WEST
/obj/screen/click_catcher
icon = 'icons/mob/screen_full.dmi'
icon_state = "passage0"
layer = 0
mouse_opacity = 2
screen_loc = "CENTER-7,CENTER-7"
/obj/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
if(modifiers["middle"] && istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr))
T.Click(location, control, params)
return 1
code/_onclick/hud/alien.dm
+3 -3
View File
@@ -134,7 +134,7 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
@@ -147,8 +147,8 @@
mymob.zone_sel.icon = 'icons/mob/screen_alien.dmi'
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.healths, nightvisionicon, alien_plasma_display, mymob.pullin, mymob.blind, mymob.flash) //, mymob.hands, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += adding + other
mymob.client.screen += mymob.client.void
code/_onclick/hud/alien_larva.dm
+4 -3
View File
@@ -38,7 +38,7 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
@@ -51,7 +51,8 @@
mymob.zone_sel.icon = 'icons/mob/screen_alien.dmi'
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list( mymob.zone_sel, mymob.healths, nightvisionicon, mymob.pullin, mymob.blind, mymob.flash) //, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += adding + other
mymob.client.screen += adding + other
mymob.client.screen += mymob.client.void
code/_onclick/hud/drones.dm
+2 -1
View File
@@ -77,5 +77,6 @@
mymob.zone_sel.icon = ui_style
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += mymob.client.void
mymob.client.screen += adding
code/_onclick/hud/human.dm
+3 -2
View File
@@ -282,7 +282,7 @@
mymob.blind.icon_state = "blackimageoverlay"
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.blind.layer = 0
mymob.damageoverlay = new /obj/screen()
@@ -305,10 +305,11 @@
mymob.zone_sel.icon = ui_style
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.internals, mymob.healths, mymob.healthdoll, mymob.pullin, mymob.blind, mymob.flash, mymob.damageoverlay, lingchemdisplay, lingstingdisplay) //, mymob.hands, mymob.rest, mymob.sleep) //, mymob.mach )
mymob.client.screen += adding + hotkeybuttons
mymob.client.screen += mymob.client.void
inventory_shown = 0;
code/_onclick/hud/monkey.dm
+3 -2
View File
@@ -120,7 +120,7 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.damageoverlay = new /obj/screen()
mymob.damageoverlay.icon = 'icons/mob/screen_full.dmi'
@@ -142,7 +142,7 @@
mymob.zone_sel.icon = ui_style
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
using = new /obj/screen/resist()
using.icon = ui_style
@@ -151,3 +151,4 @@
mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.internals, mymob.healths, mymob.pullin, mymob.blind, mymob.flash, lingchemdisplay, lingstingdisplay) //, mymob.hands, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += adding + other
mymob.client.screen += mymob.client.void
code/_onclick/hud/other_mobs.dm
+5 -4
View File
@@ -12,10 +12,11 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list(mymob.blind)
mymob.client.screen += mymob.client.void
/datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen_midnight.dmi')
@@ -31,6 +32,6 @@
blobhealthdisplay.screen_loc = ui_internal
blobhealthdisplay.layer = 20
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list(blobpwrdisplay, blobhealthdisplay)
mymob.client.screen += mymob.client.void
code/_onclick/hud/robot.dm
+3 -2
View File
@@ -136,7 +136,7 @@
mymob.blind.name = " "
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.blind.mouse_opacity = 1
mymob.blind.mouse_opacity = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
@@ -149,10 +149,11 @@
mymob.zone_sel.icon = 'icons/mob/screen_cyborg.dmi'
mymob.zone_sel.update_icon()
mymob.client.screen = null
mymob.client.screen = list()
mymob.client.screen += list(mymob.zone_sel, mymob.hands, mymob.healths, mymob.pullin, mymob.blind, mymob.flash) //, mymob.rest, mymob.sleep, mymob.mach )
mymob.client.screen += adding + other
mymob.client.screen += mymob.client.void
return
code/_onclick/hud/screen_objects.dm
-11
View File
@@ -274,17 +274,6 @@
overlays.Cut()
overlays += image('icons/mob/screen_gen.dmi', "[selecting]")
/obj/screen/Click(location, control, params)
var/list/modifiers = params2list(params)
if(modifiers["middle"] && istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
C.swap_hand()
else
var/turf/T = screen_loc2turf(modifiers["screen-loc"], get_turf(usr))
T.Click(location, control, params)
return 1
/obj/screen/inventory/Click()
// At this point in client Click() code we have passed the 1/10 sec check and little else
// We don't even know if it's a middle click
code/modules/client/client defines.dm
+1
View File
@@ -39,3 +39,4 @@
var/related_accounts_cid = "Requires database" //So admins know why it isn't working - Used to determine what other accounts previously logged in from this computer id
preload_rsc = PRELOAD_RSC
var/global/obj/screen/click_catcher/void
code/modules/client/client procs.dm
+5
View File
@@ -188,6 +188,11 @@ var/next_external_rsc = 0
send_resources()
if(!void)
void = new()
screen += void
if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
src << "<span class='info'>You have unread updates in the changelog.</span>"
if(config.aggressive_changelog)
code/modules/mob/living/simple_animal/simple_animal.dm
+5 -4
View File
@@ -65,7 +65,8 @@
/mob/living/simple_animal/Login()
if(src && src.client)
src.client.screen = null
src.client.screen = list()
client.screen += client.void
..()
/mob/living/simple_animal/updatehealth()
@@ -494,11 +495,11 @@
/mob/living/simple_animal/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
if(resize != RESIZE_DEFAULT_SIZE)
changed++
ntransform.Scale(resize)
resize = RESIZE_DEFAULT_SIZE
if(changed)
animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
code/modules/mob/login.dm
+3 -1
View File
@@ -29,7 +29,7 @@
world.update_status()
client.images = null //remove the images such as AIs being unable to see runes
client.screen = null //remove hud items just in case
client.screen = list() //remove hud items just in case
if(hud_used) del(hud_used) //remove the hud objects
hud_used = new /datum/hud(src)
@@ -54,6 +54,8 @@
if(ckey in deadmins)
verbs += /client/proc/readmin
client.screen += client.void
// Calling update_interface() in /mob/Login() causes the Cyborg to immediately be ghosted; because of winget().
// Calling it in the overriden Login, such as /mob/living/Login() doesn't cause this.
/mob/proc/update_interface()
code/modules/mob/mob.dm
+1
View File
@@ -492,6 +492,7 @@ var/list/slot_equipment_priority = list( \
log_game("[usr.key] AM failed due to disconnect.")
return
client.screen.Cut()
client.screen += client.void
if(!client)
log_game("[usr.key] AM failed due to disconnect.")
return