cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix failed mirror in listeningpost.dm

Browse Source 
https://github.com/CHOMPStation2/CHOMPStation2/pull/1777

Mirror failed and left a HEAD/TAIL marking in listeningpost.dm

This fixes that. Niche, but it stalled out my compile on junglebase (And it will prevent stalling out if gateway is ever re-enabled). c:
This commit is contained in:
Rykka
2021-08-15 15:07:23 -07:00
parent 56cf98728a
commit 083298643c
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
maps/gateway_vr/listeningpost.dm
View File

@@ -217,27 +217,6 @@
info = {"A loud, painfully high pitched SSTV signal came across global comms. It seems to be a distress signal
of some kind. To what, I have no idea. Efforts to trace the signal's origin have fallen inconclusive."}
<<<<<<< HEAD
/obj/item/weapon/paper/listneningpost/oddreport
name = "\improper Odd Report"
info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without
results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic
solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent.
If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space
will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that
stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should
it ever rear it's ugly head again. -Donk Co. Operative #451"}
||||||| parent of a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post
/obj/item/weapon/paper/listneningpost/oddreport
name = "\improper Odd Report"
info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without
results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic
solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent.
If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space
will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that
stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should
it ever rear it's ugly head again. -Donk Co. Operative #451"}
=======
/obj/item/weapon/paper/crumpled/listeningpost/fanfiction
name = "\improper Regarding Latest Report"
info = {"I swear to god, Dave, if you send us your stupid 'Futuristic version of VORE' fanfiction instead of actual
@@ -251,4 +230,3 @@
for debrief and reassignment. And to those outdated trashy outposts specifically: all data must be digital. If it's not already,
make it so. Most importantly, remember: we're at a truce now. No shooting NT goons unless they start getting frisky with restricted areas.
And don't fucking forget to debrief Dave's listening post again."}
>>>>>>> a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post