cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved all pull icon updating to update_icon(), to reduce copy+paste.

Browse Source 
Made the pull icon update_icon() as part of creation as requested by oranges.
This commit is contained in:
MrPerson
2015-03-13 12:10:13 -07:00
parent 692cfa4f1f
commit e7ba8df654
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/alien.dm
+1 -1
View File
@@ -106,7 +106,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = 'icons/mob/screen_alien.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_pull_resist
//begin indicators
code/_onclick/hud/alien_larva.dm
+1 -1
View File
@@ -29,7 +29,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = 'icons/mob/screen_alien.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_pull_resist
mymob.blind = new /obj/screen()
code/_onclick/hud/drones.dm
+1 -1
View File
@@ -11,7 +11,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = ui_style
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_drone_pull
adding += mymob.pullin
code/_onclick/hud/human.dm
+1 -1
View File
@@ -267,7 +267,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = ui_style
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_pull_resist
hotkeybuttons += mymob.pullin
code/_onclick/hud/monkey.dm
+1 -1
View File
@@ -96,7 +96,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = ui_style
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_pull_resist
lingchemdisplay = new /obj/screen/ling/chems()
code/_onclick/hud/robot.dm
+1 -1
View File
@@ -127,7 +127,7 @@
mymob.pullin = new /obj/screen/pull()
mymob.pullin.icon = 'icons/mob/screen_cyborg.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.update_icon(mymob)
mymob.pullin.screen_loc = ui_borg_pull
mymob.blind = new /obj/screen()
code/_onclick/hud/screen_objects.dm
+7
View File
@@ -187,6 +187,13 @@
/obj/screen/pull/Click()
usr.stop_pulling()
/obj/screen/pull/update_icon(mob/mymob)
if(!mymob) return
if(mymob.pulling)
icon_state = "pull"
else
icon_state = "pull0"
/obj/screen/resist
name = "resist"
icon = 'icons/mob/screen_midnight.dmi'
code/modules/mob/mob.dm
+2 -2
View File
@@ -391,7 +391,7 @@ var/list/slot_equipment_priority = list( \
src.pulling = AM
AM.pulledby = src
if(pullin)
pullin.icon_state = "pull"
pullin.update_icon(src)
if(ismob(AM))
var/mob/M = AM
if(!iscarbon(src))
@@ -408,7 +408,7 @@ var/list/slot_equipment_priority = list( \
pulling.pulledby = null
pulling = null
if(pullin)
pullin.icon_state = "pull0"
pullin.update_icon(src)
/mob/verb/mode()
set name = "Activate Held Object"