cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7854 from phil235/LifeProcsDuplicateFix

Browse Source 
Life procs duplicate fix
This commit is contained in:
Cheridan
2015-03-02 09:16:09 -06:00
parent 2be30eb89e a3aa6ff4bf
commit d218256e32
30 changed files with 956 additions and 1661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/alien.dm
+1 -1
View File
@@ -152,7 +152,7 @@
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_alien.dmi'
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
code/_onclick/hud/alien_larva.dm
+1 -1
View File
@@ -60,7 +60,7 @@
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_alien.dmi'
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
code/_onclick/hud/monkey.dm
+10 -1
View File
@@ -137,8 +137,17 @@
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.damageoverlay = new /obj/screen()
mymob.damageoverlay.icon = 'icons/mob/screen_full.dmi'
mymob.damageoverlay.icon_state = "oxydamageoverlay0"
mymob.damageoverlay.name = "dmg"
mymob.damageoverlay.blend_mode = BLEND_MULTIPLY
mymob.damageoverlay.screen_loc = "CENTER-7,CENTER-7"
mymob.damageoverlay.mouse_opacity = 0
mymob.damageoverlay.layer = 18.1 //The black screen overlay sets layer to 18 to display it, this one has to be just on top.
mymob.flash = new /obj/screen()
mymob.flash.icon = ui_style
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"
code/_onclick/hud/other_mobs.dm
+3 -1
View File
@@ -13,6 +13,9 @@
mymob.blind.screen_loc = "CENTER-7,CENTER-7"
mymob.blind.layer = 0
mymob.client.screen = null
mymob.client.screen += list(mymob.blind)
/datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen_midnight.dmi')
blobpwrdisplay = new /obj/screen()
@@ -28,6 +31,5 @@
blobhealthdisplay.layer = 20
mymob.client.screen = null
mymob.client.screen += list(blobpwrdisplay, blobhealthdisplay)
code/_onclick/hud/robot.dm
+1 -1
View File
@@ -164,7 +164,7 @@
mymob.blind.layer = 0
mymob.flash = new /obj/screen()
mymob.flash.icon = 'icons/mob/screen_cyborg.dmi'
mymob.flash.icon = 'icons/mob/screen_gen.dmi'
mymob.flash.icon_state = "blank"
mymob.flash.name = "flash"
mymob.flash.screen_loc = "WEST,SOUTH to EAST,NORTH"