cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue 695

Browse Source 
- Syringe overlay layer is no longer above the blackout screen layer
Fixed issue 704
- Shades (and all simple animals) can no longer pick up paper bins/donut boxes with clickdragging (were there any other objects you could pick up with onmousedrop?)
Fixed issue 737
- Dead/unconscious cultists no longer count towards cultist count on rune use (such as sacrifice, nar-sie, etc)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4360 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
quartz235@gmail.com
2012-08-10 20:03:24 +00:00
parent 2a120a59c2
commit 710acf77e5
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Tools.dm
+1 -1
View File
@@ -1002,7 +1002,7 @@
finalcolor = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3])
overlay.icon += finalcolor
if(!istype(src.loc, /turf)) overlay.layer = 30
if(!istype(src.loc, /turf)) overlay.layer = 17
overlays += overlay
code/modules/paperwork/paperbin.dm
+3 -3
View File
@@ -16,9 +16,9 @@
MouseDrop(mob/user as mob)
if ((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
if( !usr.get_active_hand() ) //if active hand is empty
attack_hand(usr, 1, 1)
if(!istype(usr, /mob/living/carbon/metroid) && !istype(usr, /mob/living/simple_animal))
if( !usr.get_active_hand() ) //if active hand is empty
attack_hand(usr, 1, 1)
return