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

Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456

Browse Source 
[MIRROR] [s] Fixes altclick exploits
This commit is contained in:
CitadelStationBot
2018-02-11 09:43:09 -06:00
committed by GitHub
parent 81dcb41a4d 5b1880fd47
commit 51d15518ae
60 changed files with 653 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/belt.dm
+1 -1
View File
@@ -511,7 +511,7 @@
to_chat(user, "<span class='notice'>Alt-click it to quickly draw the blade.</span>")
/obj/item/storage/belt/sabre/AltClick(mob/user)
if(!ishuman(user) || !user.canUseTopic(src, be_close=TRUE))
if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
if(contents.len)
var/obj/item/I = contents[1]
code/game/objects/items/storage/fancy.dm
+2 -2
View File
@@ -129,8 +129,8 @@
..()
to_chat(user, "<span class='notice'>Alt-click to extract contents.</span>")
/obj/item/storage/fancy/cigarettes/AltClick(mob/user)
if(user.stat || user.restrained())
/obj/item/storage/fancy/cigarettes/AltClick(mob/living/carbon/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
var/obj/item/clothing/mask/cigarette/W = locate(/obj/item/clothing/mask/cigarette) in contents
if(W && contents.len > 0)
code/game/objects/items/storage/lockbox.dm
+1 -1
View File
@@ -129,7 +129,7 @@
to_chat(user, "<span class='notice'>Alt-click to [open ? "close":"open"] it.</span>")
/obj/item/storage/lockbox/medal/AltClick(mob/user)
if(user.canUseTopic(src, be_close=TRUE))
if(user.canUseTopic(src, BE_CLOSE))
if(!locked)
open = (open ? FALSE : TRUE)
update_icon()