cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker

Browse Source 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
This commit is contained in:
ikarrus
2014-09-25 09:37:54 -06:00
parent c4efa0f773 013a1b1a3f
commit 796e540dfc
109 changed files with 1341 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+1 -1
View File
@@ -121,7 +121,7 @@
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/clown,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/rods
)
code/game/objects/structures/tables_racks.dm
+4 -2
View File
@@ -699,7 +699,7 @@ Destroy type values:
..()
/obj/structure/table/MouseDrop_T(mob/target, mob/living/carbon/human/user)
if(istype(target) && user == target)
if(istype(target) && user == target && istype(user))
if(user.canmove)
climb_table(user)
@@ -708,7 +708,9 @@ Destroy type values:
user.visible_message("<span class='warning'>[user] starts climbing onto [src].</span>", \
"<span class='notice'>[user] starts climbing onto [src].</span>")
if(do_mob(user, user, 20))
user.loc = src.loc
user.pass_flags += PASSTABLE
step(user,get_dir(user,src.loc))
user.pass_flags -= PASSTABLE
user.visible_message("<span class='warning'>[user] climbs onto [src].</span>", \
"<span class='notice'>[user] climbs onto [src].</span>")
add_logs(user, src, "climbed onto")