Skip to content

Commit

Permalink
Actually fix Colonial Space Grunts runtimes when mapped in (#7836)
Browse files Browse the repository at this point in the history
# About the pull request

This PR is a follow up to #7829 where if mapped in, space grunts will
still cause a runtime. So lets only load it when the round starts.

# Explain why it's good for the game

Allows you to map this in without runtimes.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/6bca371e-312d-442d-848a-e4bf60128622)

</details>


# Changelog
:cl: Drathek
fix: Actually fixed asset transport errors if the space grunts paper is
mapped in.
/:cl:
  • Loading branch information
Drulikar authored Dec 19, 2024
1 parent 7d11416 commit 46d9bf8
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -919,13 +919,15 @@
desc = "A tabletop game based around the USCM, easy to get into, simple to play, and most inportantly fun for the whole squad."

/obj/item/paper/colonial_grunts/Initialize(mapload, photo_list)
. = ..()
return INITIALIZE_HINT_LATELOAD
..()
return INITIALIZE_HINT_ROUNDSTART

/obj/item/paper/colonial_grunts/LateInitialize()
. = ..()
info = "<div> <img style='align:middle' src='[SSassets.transport.get_asset_url("colonialspacegruntsEZ.png")]'>"
update_icon()

/obj/item/paper/colonial_grunts/update_icon()
return // Keep original icon_state

/obj/item/paper/liaison_brief
name = "Liaison Colony Briefing"
Expand Down

0 comments on commit 46d9bf8

Please sign in to comment.