cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes for wrapper code (#37525)

Browse Source 
* Some fixes for wrapper code

* linter
This commit is contained in:
ShiftyRail
2025-05-06 14:03:20 +01:00
committed by GitHub
parent 07588cfa93
commit fa42b8cca8
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/stacks/packagewrap.dm
View File

@@ -67,7 +67,7 @@
if(target.anchored)
to_chat(user, "<span class='notice'>You can't get the wrapping around \the [target].</span>")
return
if(target in user)
if( (target in user) && !(target in user.held_items)) // Can wrap things in held items.
to_chat(user, "<span class='notice'>That's not gonna work.</span>")
return
if(!proximity_flag)
@@ -85,13 +85,17 @@
if(istype(target, /obj/item) && smallpath)
if (amount >= 1)
var/obj/item/I = target
var/obj/item/P = new smallpath(get_turf(target.loc),target,round(I.w_class))
var/gift_in_hands = user.is_holding_item(target)
var/obj/item/P = new smallpath(get_turf(target),target,round(I.w_class))
if(!istype(target.loc, /turf))
if(user.client)
user.client.screen -= target
user.drop_item(target, force_drop = 1)
target.forceMove(P)
P.add_fingerprint(user)
use(1)
if (gift_in_hands)
user.put_in_hands(P)
to_chat(user, "<span class='notice'>You wrap \the [target] with \the [src].</span>")
else
to_chat(user, "<span class='warning'>You need more paper!</span>")
@@ -105,7 +109,7 @@
if(MC.angry)
return
if(amount >= 3)
var/obj/item/P = new bigpath(get_turf(target.loc),target)
var/obj/item/P = new bigpath(get_turf(target), target)
target.forceMove(P)
P.add_fingerprint(user)
use(3)

8
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -26,7 +26,7 @@
gift = target
update_icon()
/obj/item/weapon/gift/attackby(obj/item/W as obj, mob/user as mob)
/obj/item/weapon/gift/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"What should the label read? (max 52 characters)","Write a personal message!","") as message|null),1,MAX_NAME_LEN * 2)
if (!Adjacent(user) || user.stat)
@@ -51,9 +51,7 @@
icon_state = "gift-large"
item_state = "gift-large"
/obj/item/weapon/gift/attack_self(mob/user as mob)
for(var/I in contents)
user.put_in_hands(I)
/obj/item/weapon/gift/attack_self(mob/user)
user.drop_item(src, force_drop = 1)
if(gift)
user.put_in_active_hand(gift)
@@ -61,6 +59,8 @@
to_chat(user, "<span class='notice'>You unwrapped \a [gift]!</span>")
else
to_chat(user, "<span class='notice'>The gift was empty!</span>")
for (var/obj/item/I in contents)
I.forceMove(get_turf(user))
qdel(src)
return