cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7567 from SamHPurp/re-factors-posters

Browse Source 
Refactors posters
This commit is contained in:
Fox McCloud
2017-07-10 18:48:21 -04:00
committed by GitHub
parent c52a8e76c2 ded0acb5f9
commit 23ee7f02d5
38 changed files with 655 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/frames.dm
+6 -6
View File
@@ -43,10 +43,10 @@
overlays |= icon_state
/obj/item/weapon/picture_frame/proc/insert(obj/D)
if(istype(D, /obj/item/weapon/contraband/poster))
var/obj/item/weapon/contraband/poster/P = D
displayed = P.resulting_poster
P.resulting_poster = null
if(istype(D, /obj/item/weapon/poster))
var/obj/item/weapon/poster/P = D
displayed = P.poster_structure
P.poster_structure = null
else
displayed = D
@@ -54,7 +54,7 @@
displayed.pixel_x = 0
displayed.pixel_y = 0
displayed.forceMove(src)
if(istype(D, /obj/item/weapon/contraband/poster))
if(istype(D, /obj/item/weapon/poster))
qdel(D)
/obj/item/weapon/picture_frame/attackby(obj/item/I, mob/user)
@@ -85,7 +85,7 @@
O.forceMove(user.loc)
displayed = null
qdel(src)
else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/contraband/poster))
else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo) || istype(I, /obj/item/weapon/poster))
if(!displayed)
user.unEquip(I)
insert(I)