cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 19:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes posters on lateload maps (#6856)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
This commit is contained in:
CHOMPStation2
2023-08-23 05:34:37 -07:00
committed by GitHub
parent f495cfceaf
commit 7fa2727cec
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/posters/posters.dm
+19 -23
View File
@@ -126,8 +126,25 @@
var/roll_type = /obj/item/poster
var/ruined = FALSE
// This stuff needs to go in new() for the the flick() to look right while it's being placed
/obj/structure/sign/poster/New(var/newloc, var/placement_dir = null, var/obj/item/poster/P = null)
/obj/structure/sign/poster/Initialize(var/newloc, var/placement_dir = null, var/obj/item/poster/P = null)
. = ..()
if(ispath(src.poster_decl))
src.poster_decl = get_poster_decl(src.poster_decl, TRUE)
else if(istype(P))
src.poster_decl = P.poster_decl
roll_type = P.type
else if(ispath(P))
src.poster_decl = get_poster_decl(P, TRUE)
else
src.poster_decl = get_poster_decl(/decl/poster, FALSE)
while (istype(src.poster_decl, /decl/poster/lewd))
src.poster_decl = get_poster_decl(/decl/poster, FALSE)
name = "[initial(name)] - [poster_decl.name]"
desc = "[initial(desc)] [poster_decl.desc]"
icon_state = poster_decl.icon_state
if(placement_dir)
dir = placement_dir
@@ -146,27 +163,6 @@
pixel_y = 0
flick("poster_being_set", src)
return ..()
/obj/structure/sign/poster/Initialize(var/newloc, var/placement_dir = null, var/obj/item/poster/P = null)
if(ispath(src.poster_decl))
src.poster_decl = get_poster_decl(src.poster_decl, TRUE)
else if(istype(P))
src.poster_decl = P.poster_decl
roll_type = P.type
else if(ispath(P))
src.poster_decl = get_poster_decl(P, TRUE)
else
src.poster_decl = get_poster_decl(/decl/poster, FALSE)
while (istype(src.poster_decl, /decl/poster/lewd))
src.poster_decl = get_poster_decl(/decl/poster, FALSE)
name = "[initial(name)] - [poster_decl.name]"
desc = "[initial(desc)] [poster_decl.desc]"
icon_state = poster_decl.icon_state
return ..()
/obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(W.is_wirecutter())