cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-10 01:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7178 from VOREStation/pol-mousedrop

Browse Source 
Fixes mousedrop shenanigans
This commit is contained in:
Atermonera
2020-05-21 11:35:09 -07:00
committed by GitHub
parent c95b82aeb1 014592e780
commit 267a563dfc
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/game/machinery/OpTable.dm
View File

@@ -53,15 +53,6 @@
return TRUE
return FALSE
/obj/machinery/optable/MouseDrop_T(obj/O as obj, mob/user as mob)
if((!(istype(O, /obj/item/weapon)) || user.get_active_hand() != O))
return
user.drop_item()
if(O.loc != src.loc)
step(O, get_dir(O, src))
return
/obj/machinery/optable/proc/check_victim()
if(locate(/mob/living/carbon/human, src.loc))
var/mob/living/carbon/human/M = locate(/mob/living/carbon/human, src.loc)
@@ -96,40 +87,43 @@
else
icon_state = "table2-idle"
/obj/machinery/optable/MouseDrop_T(mob/target, mob/user)
var/mob/living/M = user
if(user.stat || user.restrained() || !check_table(user) || !iscarbon(target))
return
if(istype(M))
take_victim(target,user)
else
/obj/machinery/optable/MouseDrop_T(mob/living/carbon/target, mob/living/user)
if(!istype(target) || !istype(user))
return ..()
if(!Adjacent(target) || !Adjacent(user))
return ..()
if(user.incapacitated() || !check_table(target, user))
return ..()
take_victim(target, user)
/obj/machinery/optable/verb/climb_on()
set name = "Climb On Table"
set category = "Object"
set src in oview(1)
if(usr.stat || !ishuman(usr) || usr.restrained() || !check_table(usr))
var/mob/living/user = usr
if(!istype(user) || user.incapacitated() || !check_table(user, user))
return
take_victim(usr,usr)
take_victim(user, user)
/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
/obj/machinery/optable/attackby(obj/item/weapon/W, mob/living/carbon/user)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
if(iscarbon(G.affecting) && check_table(G.affecting))
take_victim(G.affecting,usr)
if(iscarbon(G.affecting) && check_table(G.affecting, user))
take_victim(G.affecting, user)
qdel(W)
return
/obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob)
/obj/machinery/optable/proc/check_table(mob/living/carbon/patient, mob/living/user)
check_victim()
if(victim && get_turf(victim) == get_turf(src) && victim.lying)
to_chat(usr, "<span class='warning'>\The [src] is already occupied!</span>")
to_chat(user, "<span class='warning'>\The [src] is already occupied!</span>")
return 0
if(patient.buckled)
to_chat(usr, "<span class='notice'>Unbuckle \the [patient] first!</span>")
to_chat(user, "<span class='notice'>Unbuckle \the [patient] first!</span>")
return 0
return 1

7
code/game/machinery/oxygen_pump.dm
View File

@@ -41,8 +41,11 @@
return ..()
/obj/machinery/oxygen_pump/MouseDrop(var/mob/living/carbon/human/target, src_location, over_location)
..()
if(istype(target) && CanMouseDrop(target))
var/mob/living/user = usr
if(!istype(user) || !istype(target))
return ..()
if(CanMouseDrop(target, user))
if(!can_apply_to_target(target, usr)) // There is no point in attempting to apply a mask if it's impossible.
return
usr.visible_message("\The [usr] begins placing \the [contained] onto [target].")