cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

Browse Source
This commit is contained in:
Aurorablade
2016-08-19 01:01:19 -04:00
parent 2daa65a200 08800863ad
commit ec3d8c67a5
263 changed files with 5239 additions and 42840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/click.dm
+6 -5
View File
@@ -221,7 +221,7 @@
A.ShiftClick(src)
return
/atom/proc/ShiftClick(var/mob/user)
if(user.client && user.client.eye == user)
if(user.client && get_turf(user.client.eye) == get_turf(user))
user.examinate(src)
return
@@ -263,12 +263,13 @@
/atom/proc/AltClick(var/mob/user)
var/turf/T = get_turf(src)
if(T && user.TurfAdjacent(T))
if(user.listed_turf == T)
user.listed_turf = null
else
if(T)
if(user.TurfAdjacent(T))
user.listed_turf = T
user.client.statpanel = T.name
// If we had a method to force a `Stat` update, it would go here
else
user.listed_turf = null
return
/mob/proc/TurfAdjacent(var/turf/T)
code/_onclick/item_attack.dm
+9 -1
View File
@@ -33,11 +33,19 @@
var/messagesource = M
if(can_operate(M)) //Checks if mob is lying down on table for surgery
if(istype(src,/obj/item/robot_parts))//popup ovveride for direct attach
if(istype(src,/obj/item/robot_parts))//popup override for direct attach
if(!attempt_initiate_surgery(src, M, user,1))
return 0
else
return 1
if(istype(src,/obj/item/organ/external))
var/obj/item/organ/external/E = src
if(E.robotic == 2) // Robot limbs are less messy to attach
if(!attempt_initiate_surgery(src, M, user,1))
return 0
else
return 1
if(istype(src,/obj/item/weapon/screwdriver) && M.get_species() == "Machine")
if(!attempt_initiate_surgery(src, M, user))
return 0