cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-21 20:07:22 -04:00
committed by GitHub
parent 087c7b63be
commit 9c54bc8858
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/posters/polarisposters_vr.dm
+1 -11
View File
@@ -1,15 +1,5 @@
<<<<<<< HEAD
/datum/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
/decl/poster/nanotrasen/nt_7 //YW EDIT: SolGov, USDF
name = "SolGov"
desc = "This poster showcases an USDF emblem. The outer ring reads,\
||||||| parent of 07f5043a5b... Merge pull request #10698 from VOREStation/upstream-merge-8128
/datum/poster/nanotrasen/nt_7
name = "SolCom"
desc = "This poster showcases an TCG emblem. The outer ring reads,\
=======
/decl/poster/nanotrasen/nt_7
name = "SolCom"
desc = "This poster showcases an TCG emblem. The outer ring reads,\
>>>>>>> 07f5043a5b... Merge pull request #10698 from VOREStation/upstream-merge-8128
\"<font face='times new roman ms'>NIL MORTALIBUS ARDUI EST</font>\".\
Commonwealth of Sol-Procyon."