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

Revert "Makes mechs use some of pilot huds (job,wanted,loyalty,antag)"

Browse Source
This commit is contained in:
AnturK
2015-11-11 17:39:42 +01:00
parent 70222112f8
commit 686366fe98
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+1 -21
View File
@@ -77,7 +77,7 @@
var/datum/action/innate/mecha/mech_toggle_lights/lights_action = new
var/datum/action/innate/mecha/mech_view_stats/stats_action = new
hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD,ANTAG_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,ANTAG_HUD)
hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD)
/obj/mecha/New()
..()
@@ -727,18 +727,6 @@
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
if(!internal_damage)
occupant << sound('sound/mecha/nominal.ogg',volume=50)
//transfer HUD icons
for(var/hud_type in occupant.hud_possible)
if(hud_type in hud_possible)
var/image/mech_hud = hud_list[hud_type]
var/image/occupant_hud = occupant.hud_list[hud_type]
mech_hud.icon_state = occupant_hud.icon_state
//add mech to the huds
for(var/datum/atom_hud/hud in huds)
if(occupant in hud.hudatoms)
hud.add_to_hud(src)
return 1
else
return 0
@@ -813,14 +801,6 @@
if(ishuman(occupant))
mob_container = occupant
RemoveActions(occupant, human_occupant=1)
for(var/hud_type in occupant.hud_possible)
if(hud_type in hud_possible)
var/image/holder = hud_list[hud_type]
holder.icon_state = ""
//remove mech from huds
for(var/datum/atom_hud/hud in huds)
if(occupant in hud.hudatoms)
hud.remove_from_hud(src)
else if(istype(occupant, /mob/living/carbon/brain))
var/mob/living/carbon/brain/brain = occupant
RemoveActions(brain)