mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 06:00:23 +01:00
Resisting out of lockers
- Being inside a wrapped locker no longer delete you when you resist out of it. Fixes Issue 596 - Resisting out of a locker now takes longer then 5 seconds Certain spells can no longer be cast on z2 - 'walk through wall' spells are disabled to prevent people from getting to centcomm - 'construct turf' spells are disabled because turfs in transit space crash the server get_contents() - Now recursively runs through a mobs contents for items and should actually find everything. - Now take package wrapped items into account. check_for_contents() now simply calls get_contents() to generate a list instead of using copy/pasted code from get_contents(). git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4064 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -19,6 +19,9 @@ PHOTOGRAPHS
|
||||
user << "\blue You need more paper!"
|
||||
return
|
||||
else
|
||||
if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/weapon/gift)) //No gift wrapping gifts!
|
||||
return
|
||||
|
||||
src.amount -= a_used
|
||||
user.drop_item()
|
||||
var/obj/item/weapon/gift/G = new /obj/item/weapon/gift( src.loc )
|
||||
|
||||
Reference in New Issue
Block a user