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

Merge to master

Browse Source 
Conflicts in mob.dm
This commit is contained in:
Perakp
2014-02-18 23:59:59 +02:00
parent 1004235a28 6f4680c53b
commit 965e7ad6d8
229 changed files with 4656 additions and 3665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+3 -3
View File
@@ -987,7 +987,7 @@
return
for(var/obj/item/I in M)
M.u_equip(I)
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
@@ -1016,7 +1016,7 @@
return
for(var/obj/item/I in M)
M.u_equip(I)
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
@@ -1067,7 +1067,7 @@
return
for(var/obj/item/I in M)
M.u_equip(I)
M.unEquip(I)
if(I)
I.loc = M.loc
I.layer = initial(I.layer)
code/modules/admin/verbs/randomverbs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
return
for(var/obj/item/W in M)
M.drop_from_inventory(W)
M.unEquip(W)
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)