Merge pull request #5064 from VOREStation/vs-port-3142

[PORT] Improved playsound and drop_location() from /tg
This commit is contained in:
Anewbe
2018-03-17 15:01:07 -05:00
committed by GitHub
15 changed files with 239 additions and 159 deletions
+1 -1
View File
@@ -208,7 +208,7 @@ var/list/slot_equipment_priority = list( \
if(target)
I.forceMove(target)
else
I.dropInto(loc)
I.dropInto(drop_location())
I.dropped(src)
return 1
+15 -1
View File
@@ -1169,6 +1169,20 @@ default behaviour is:
item.throw_at(target, throw_range, item.throw_speed, src)
/mob/living/get_sound_env(var/pressure_factor)
if (hallucination)
return PSYCHOTIC
else if (druggy)
return DRUGGED
else if (drowsyness)
return DIZZY
else if (confused)
return DIZZY
else if (sleeping)
return UNDERWATER
else
return ..()
//Add an entry to overlays, assuming it exists
/mob/living/proc/apply_hud(cache_index, var/image/I)
hud_list[cache_index] = I
@@ -1186,4 +1200,4 @@ default behaviour is:
return I
/mob/living/proc/make_hud_overlays()
return
return
+7
View File
@@ -629,6 +629,13 @@ var/global/image/backplane
return TRUE
/mob/proc/get_sound_env(var/pressure_factor)
if (pressure_factor < 0.5)
return SPACE
else
var/area/A = get_area(src)
return A.sound_env
/mob/proc/position_hud_item(var/obj/item/item, var/slot)
if(!istype(hud_used) || !slot || !LAZYLEN(hud_used.slot_info))
return