shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-29105

Browse Source
This commit is contained in:
LetterJay
2017-09-02 07:11:32 -05:00
committed by GitHub
parent 8731fb7e1c 2bfc7872fa
commit 3e0ead1204
1577 changed files with 55829 additions and 215217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+2 -2
View File
@@ -1702,7 +1702,7 @@
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human.")
return
var/obj/item/weapon/reagent_containers/food/snacks/cookie/cookie = new(H)
var/obj/item/reagent_containers/food/snacks/cookie/cookie = new(H)
if(H.put_in_hands(cookie))
H.update_inv_hands()
else
@@ -1771,7 +1771,7 @@
else if(href_list["reject_custom_name"])
if(!check_rights(R_ADMIN))
return
var/obj/item/weapon/station_charter/charter = locate(href_list["reject_custom_name"])
var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"])
if(istype(charter))
charter.reject_proposed(usr)
else if(href_list["jumpto"])