cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7962 from Baystation12/master

Browse Source 
master->freeze
This commit is contained in:
Chinsky
2015-01-27 21:55:46 +03:00
parent 2a516ed80a c2d8426af0
commit c7aff28ffe
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/teleporter.dm
View File

@@ -118,8 +118,10 @@
areaindex[tmpname] = 1 areaindex[tmpname] = 1
L[tmpname] = I L[tmpname] = I
var/desc = input("Please select a location to lock in.", "Locking Computer") in L var/desc = input("Please select a location to lock in.", "Locking Computer") in L|null
if(get_dist(src, usr) > 1) if(!desc)
return
if(get_dist(src, usr) > 1 && !issilicon(usr))
return return
src.locked = L[desc] src.locked = L[desc]

2
code/modules/mob/living/simple_animal/friendly/cat.dm
View File

@@ -68,7 +68,7 @@
/mob/living/simple_animal/cat/MouseDrop(atom/over_object) /mob/living/simple_animal/cat/MouseDrop(atom/over_object)
var/mob/living/carbon/H = over_object var/mob/living/carbon/H = over_object
if(!istype(H)) return ..() if(!istype(H) || !Adjacent(H)) return ..()
if(H.a_intent == "help") if(H.a_intent == "help")
get_scooped(H) get_scooped(H)