cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8443 from Baystation12/master

Browse Source 
Master into dev-freeze.
This commit is contained in:
Zuhayr
2015-03-11 19:37:19 +10:30
parent 69a080e2d6 47fc0aa12c
commit b5419a1673
6 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/alien/life.dm
View File

@@ -149,9 +149,6 @@
else else
healths.icon_state = "health7" healths.icon_state = "health7"
if(pullin)
pullin.icon_state = "pull[pulling ? 1 : 0]"
if (client) if (client)
client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired) client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)

1
code/modules/mob/living/carbon/brain/life.dm
View File

@@ -225,7 +225,6 @@
else else
healths.icon_state = "health7" healths.icon_state = "health7"
if(pullin) pullin.icon_state = "pull[pulling ? 1 : 0]"
if (client) if (client)
client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired) client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)

3
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1317,9 +1317,6 @@
if(pressure) if(pressure)
pressure.icon_state = "pressure[pressure_alert]" pressure.icon_state = "pressure[pressure_alert]"
if(pullin)
if(pulling) pullin.icon_state = "pull1"
else pullin.icon_state = "pull0"
// if(rest) //Not used with new UI // if(rest) //Not used with new UI
// if(resting || lying || sleeping) rest.icon_state = "rest1" // if(resting || lying || sleeping) rest.icon_state = "rest1"
// else rest.icon_state = "rest0" // else rest.icon_state = "rest0"

3
code/modules/mob/living/carbon/monkey/life.dm
View File

@@ -521,9 +521,6 @@
if(pressure) if(pressure)
pressure.icon_state = "pressure[pressure_alert]" pressure.icon_state = "pressure[pressure_alert]"
if(pullin) pullin.icon_state = "pull[pulling ? 1 : 0]"
if (toxin) toxin.icon_state = "tox[phoron_alert ? 1 : 0]" if (toxin) toxin.icon_state = "tox[phoron_alert ? 1 : 0]"
if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]" if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
if (fire) fire.icon_state = "fire[fire_alert ? 2 : 0]" if (fire) fire.icon_state = "fire[fire_alert ? 2 : 0]"

2
code/modules/mob/living/silicon/robot/life.dm
View File

@@ -262,8 +262,6 @@
else else
src.bodytemp.icon_state = "temp-2" src.bodytemp.icon_state = "temp-2"
if(src.pullin) src.pullin.icon_state = "pull[src.pulling ? 1 : 0]"
//Oxygen and fire does nothing yet!! //Oxygen and fire does nothing yet!!
// if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]" // if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]"
// if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]" // if (src.fire) src.fire.icon_state = "fire[src.fire_alert ? 1 : 0]"

5
code/modules/mob/mob.dm
View File

@@ -616,6 +616,8 @@ var/list/slot_equipment_priority = list( \
if(pulling) if(pulling)
pulling.pulledby = null pulling.pulledby = null
pulling = null pulling = null
if(pullin)
pullin.icon_state = "pull1"
/mob/proc/start_pulling(var/atom/movable/AM) /mob/proc/start_pulling(var/atom/movable/AM)
if ( !AM || !usr || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort! if ( !AM || !usr || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
@@ -642,6 +644,9 @@ var/list/slot_equipment_priority = list( \
src.pulling = AM src.pulling = AM
AM.pulledby = src AM.pulledby = src
if(pullin)
pullin.icon_state = "pull0"
if(ishuman(AM)) if(ishuman(AM))
var/mob/living/carbon/human/H = AM var/mob/living/carbon/human/H = AM
if(H.pull_damage()) if(H.pull_damage())