Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into harddel-test-thing
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkSuckerberg committed Aug 11, 2023
2 parents ce241ee + 6e05bdd commit 9c58a6e
Show file tree
Hide file tree
Showing 188 changed files with 13,590 additions and 7,134 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2055,7 +2055,7 @@
/obj/structure/table/glass,
/obj/item/paper{
desc = "Standard Nanotrasen typeface for important documents.";
info = "Welcome to the NNTVS 'Not Nanotrasen Vault Station'! We are never happier to have people on board than when we get new arrivals ready to betray and renounce their allegiance to the coporate egregory known as Nanotrasen! ";
default_raw_text = "Welcome to the NNTVS 'Not Nanotrasen Vault Station'! We are never happier to have people on board than when we get new arrivals ready to betray and renounce their allegiance to the coporate egregory known as Nanotrasen! ";
name = "Corporate Desertion and You!"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4242,7 +4242,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/defibrillator,
/obj/item/paper/fluff/ruins/oldstation/protosleep{
info = "<b>*Prototype Sleeper*</b><br><br>We have deliverted the lastest in medical technology to the medical bay for your use."
default_raw_text = "<b>*Prototype Sleeper*</b><br><br>We have deliverted the lastest in medical technology to the medical bay for your use."
},
/obj/machinery/power/apc{
dir = 1;
Expand Down Expand Up @@ -8454,7 +8454,7 @@
/obj/machinery/light/directional/east,
/obj/structure/table/reinforced,
/obj/item/paper/fluff/ruins/oldstation/protosing{
info = "fucking uhhh tesla -I'll finish this later, Professor Fiddler";
default_raw_text = "fucking uhhh tesla -I'll finish this later, Professor Fiddler";
name = "Tesla Generator"
},
/turf/open/floor/plasteel/white,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4701,7 +4701,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/cell_charger,
/obj/item/paper{
info = "I don't know how long we're gonna be asleep for, so I've gone ahead and turned off the atmospherics systems. When you get back up. Turn them on! The base won't work long without it."
default_raw_text = "I don't know how long we're gonna be asleep for, so I've gone ahead and turned off the atmospherics systems. When you get back up. Turn them on! The base won't work long without it."
},
/turf/open/floor/plasteel,
/area/ruin/powered/slimelab/lava)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2698,7 +2698,7 @@
/area/ruin/jungle)
"Pu" = (
/obj/item/paper/crumpled/bloody{
info = "Those damn bastards came and shot up the place. I refused to give them my knowledge. I don't have much longer. Keep it safe, please...";
default_raw_text = "Those damn bastards came and shot up the place. I refused to give them my knowledge. I don't have much longer. Keep it safe, please...";
pixel_x = 8;
pixel_y = 4;
desc = "A hastily written note."
Expand Down
14 changes: 7 additions & 7 deletions _maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
dir = 10
},
/obj/item/paper/pamphlet{
info = "<center><h1> Welcome at MedTech Ltd.!</h1></center><hr><p>MedTech is a professional chemical and pharmaceutical manufacturing company with a leading position in the galactinc market.</p><p>Our goal is to provide all relevant medical and industrial chemicals to every customer in the galaxy within a short time, and at a affordable price. We achieve this goal by diversifying our manufacturing sites across the all frontiers and by sourcing all raw materials locally.</p><center><p><b>Special orders are avalible now!</b></p><p>Buy our products or visit one of our manufacturing plants today!</p></center><hr></p><sub>MedTech Ltd. takes no liability for any misuse or side effects of their products including diarrhea, dizziness, heart issues (palpitations, irregular heartbeats), death, and all other forms of possible pre- and post-mortem agony.</sub></p>";
default_raw_text = "<center><h1> Welcome at MedTech Ltd.!</h1></center><hr><p>MedTech is a professional chemical and pharmaceutical manufacturing company with a leading position in the galactinc market.</p><p>Our goal is to provide all relevant medical and industrial chemicals to every customer in the galaxy within a short time, and at a affordable price. We achieve this goal by diversifying our manufacturing sites across the all frontiers and by sourcing all raw materials locally.</p><center><p><b>Special orders are avalible now!</b></p><p>Buy our products or visit one of our manufacturing plants today!</p></center><hr></p><sub>MedTech Ltd. takes no liability for any misuse or side effects of their products including diarrhea, dizziness, heart issues (palpitations, irregular heartbeats), death, and all other forms of possible pre- and post-mortem agony.</sub></p>";
name = "MedTech flyer";
pixel_x = 6;
pixel_y = 3
Expand Down Expand Up @@ -362,7 +362,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper/crumpled/bloody{
desc = "written hastly on a blood stained peace of paper.";
info = "They breached all the doors, I am the last one, its over for me..";
default_raw_text = "They breached all the doors, I am the last one, its over for me..";
name = "MedTech chmist's last note";
pixel_x = 15;
pixel_y = 1
Expand All @@ -379,7 +379,7 @@
"hF" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper{
info = "<h1>Export expectations</h1><p>By the end of the month facility No.475-24 is expected to provide the following amounts of medicine to be ready for export:</p><ol><li>300u of Perfluorodecalin</li><li>270u of Thializid</li><li>50 Burnpatches</li><li>65 Synthflesh patches</li><li>275u of atropine</li></ol><p>Production is to be proceeded with imidiately.</p>";
default_raw_text = "<h1>Export expectations</h1><p>By the end of the month facility No.475-24 is expected to provide the following amounts of medicine to be ready for export:</p><ol><li>300u of Perfluorodecalin</li><li>270u of Thializid</li><li>50 Burnpatches</li><li>65 Synthflesh patches</li><li>275u of atropine</li></ol><p>Production is to be proceeded with imidiately.</p>";
name = "Export orders";
pixel_x = 4;
pixel_y = 5
Expand Down Expand Up @@ -1502,7 +1502,7 @@
/obj/effect/decal/cleanable/blood/bubblegum,
/obj/item/paper/crumpled/fluff{
desc = "Written as with a dying hand..";
info = "I bolted down my door to keep them out for w while, one of them got me in the arm. I hope the response unit will arrive soon...";
default_raw_text = "I bolted down my door to keep them out for w while, one of them got me in the arm. I hope the response unit will arrive soon...";
name = "Hastly scribbled note"
},
/turf/open/floor/wood,
Expand Down Expand Up @@ -1676,7 +1676,7 @@
},
/obj/item/paper/crumpled/bloody{
desc = "written hastly on a blood stained peace of paper.";
info = "Hilbert welded himself in maintainance from the inside. Perhaps a death from starvation is better than the fate that awaits us when the doors bust...";
default_raw_text = "Hilbert welded himself in maintainance from the inside. Perhaps a death from starvation is better than the fate that awaits us when the doors bust...";
name = "Office clerks last note";
pixel_x = -13;
pixel_y = -6
Expand Down Expand Up @@ -2860,7 +2860,7 @@
/obj/effect/decal/cleanable/blood/bubblegum,
/obj/item/paper/crumpled/bloody{
desc = "This is probably a document you were not supposed to see";
info = "<center><h1 style='background-color:red;'>TOP SECRET - EYES ONLY!</h1></center><h2 align='center'>Pricing reqest</h2><p>The Syndicate is interested to place an order for several hundred units of a chemical known as romerol. Hereby a request is placed to set a pricetag for such an order.</p><p>A small sample of the regent in question has been attached for testing purposes.</p><p>The contents of this document is to be treated highly confidential, any suspicion that informatin cantained in this letter has been forwarded will be met with recogninzing MedTech Ltd. as a enemy side of the conflict by The Syndicate.</p></p>We are lookig forward for a reply that will ensure our long-term cooperation.</p><br></p>Death to Nanotrasen!</p><p style = 'font-family:serif'><i><b>The Syndicate</b></i></p><center><h1 style='background-color:red;'>TOP SECRET - EYES ONLY!</h1></center>";
default_raw_text = "<center><h1 style='background-color:red;'>TOP SECRET - EYES ONLY!</h1></center><h2 align='center'>Pricing reqest</h2><p>The Syndicate is interested to place an order for several hundred units of a chemical known as romerol. Hereby a request is placed to set a pricetag for such an order.</p><p>A small sample of the regent in question has been attached for testing purposes.</p><p>The contents of this document is to be treated highly confidential, any suspicion that informatin cantained in this letter has been forwarded will be met with recogninzing MedTech Ltd. as a enemy side of the conflict by The Syndicate.</p></p>We are lookig forward for a reply that will ensure our long-term cooperation.</p><br></p>Death to Nanotrasen!</p><p style = 'font-family:serif'><i><b>The Syndicate</b></i></p><center><h1 style='background-color:red;'>TOP SECRET - EYES ONLY!</h1></center>";
name = "Top Secret Syndicate Romerol price request"
},
/turf/open/floor/carpet/blue,
Expand Down Expand Up @@ -3093,7 +3093,7 @@
dir = 10
},
/obj/item/paper/pamphlet{
info = "<center><h1> Welcome at MedTech Ltd.!</h1></center><hr><p>MedTech is a professional chemical and pharmaceutical manufacturing company with a leading position in the galactinc market.</p><p>Our goal is to provide all relevant medical and industrial chemicals to every customer in the galaxy within a short time, and at a affordable price. We achieve this goal by diversifying our manufacturing sites across the all frontiers and by sourcing all raw materials locally.</p><center><p><b>Special orders are avalible now!</b></p><p>Buy our products or visit one of our manufacturing plants today!</p></center><hr></p><sub>MedTech Ltd. takes no liability for any misuse or side effects of their products including diarrhea, dizziness, heart issues (palpitations, irregular heartbeats), death, and all other forms of possible pre- and post-mortem agony.</sub></p>";
default_raw_text = "<center><h1> Welcome at MedTech Ltd.!</h1></center><hr><p>MedTech is a professional chemical and pharmaceutical manufacturing company with a leading position in the galactinc market.</p><p>Our goal is to provide all relevant medical and industrial chemicals to every customer in the galaxy within a short time, and at a affordable price. We achieve this goal by diversifying our manufacturing sites across the all frontiers and by sourcing all raw materials locally.</p><center><p><b>Special orders are avalible now!</b></p><p>Buy our products or visit one of our manufacturing plants today!</p></center><hr></p><sub>MedTech Ltd. takes no liability for any misuse or side effects of their products including diarrhea, dizziness, heart issues (palpitations, irregular heartbeats), death, and all other forms of possible pre- and post-mortem agony.</sub></p>";
name = "MedTech flyer";
pixel_x = -5;
pixel_y = 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
"S" = (
/obj/structure/table/wood,
/obj/item/paper{
info = "Forgot I had this paper on me, so I might as well use it as a diary. Today is the 23rd of July, or atleast that's what I made up in my head, and I am currently fulfilling my dream career of carving coffins. Yep, I'm living my best life here. I tamed a monkey a while back, named him Palmo, little guy's been a dear friend since. Until activity picks up on this planet I'm just gonna live a nice and quiet life, and then sell my masterfully crafted coffins to all those in need of them. Also, I found some peculiar fruit earlier, tastes pretty good but I think I probably ingested a few of the seeds. Shouldn't be TOO bad for me. Either way, I'm going to go to bed. Hopefully I find some more paper to use so I can keep writing.";
default_raw_text = "Forgot I had this paper on me, so I might as well use it as a diary. Today is the 23rd of July, or atleast that's what I made up in my head, and I am currently fulfilling my dream career of carving coffins. Yep, I'm living my best life here. I tamed a monkey a while back, named him Palmo, little guy's been a dear friend since. Until activity picks up on this planet I'm just gonna live a nice and quiet life, and then sell my masterfully crafted coffins to all those in need of them. Also, I found some peculiar fruit earlier, tastes pretty good but I think I probably ingested a few of the seeds. Shouldn't be TOO bad for me. Either way, I'm going to go to bed. Hopefully I find some more paper to use so I can keep writing.";
pixel_x = 3;
pixel_y = 3
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_surface_ikea_ai.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
/area/ruin/powered)
"Q" = (
/obj/item/paper{
info = "Welcome to your Space Ikea Brand Full AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle. Thank you for shopping Space Ikea!"
default_raw_text = "Welcome to your Space Ikea Brand Full AI Kit! There are all the amenities needed to create a functional AI for your installation in this easy to use kit! Note: Warranty void if exposed to: High Humidity, High Temperatures, Grass, Mud, The Jungle. Thank you for shopping Space Ikea!"
},
/turf/open/floor/wood,
/area/ruin/powered)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@
"OW" = (
/obj/structure/table/reinforced,
/obj/item/trash/syndi_cakes,
/obj/machinery/photocopier/faxmachine,
/obj/machinery/fax,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort/jerry)
"Ph" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"M" = (
/obj/structure/table,
/obj/item/paper/crumpled{
info = "Objective is to locate and secure the reliquary holding the supernatural items, then swing them back to HQ for containment. Simple job for Mystery Inc.";
default_raw_text = "Objective is to locate and secure the reliquary holding the supernatural items, then swing them back to HQ for containment. Simple job for Mystery Inc.";
name = "Mission Statement";
pixel_x = -5
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
/obj/structure/stone_tile/slab,
/obj/item/paper{
desc = "A hastily written note, written in the Lizard language.";
info = "To all brethren who may read this, we are sorry. We failed to defend the Necropolis, and those from the sky destroyed our home. I write this in my last dying breath, to warn you to not make our mistakes. Don't let them fool you with their actions, all of those who come from the sky are not your friends. They wish to loot and pillage your villages. Please do not make our same mistakes."
default_raw_text = "To all brethren who may read this, we are sorry. We failed to defend the Necropolis, and those from the sky destroyed our home. I write this in my last dying breath, to warn you to not make our mistakes. Don't let them fool you with their actions, all of those who come from the sky are not your friends. They wish to loot and pillage your villages. Please do not make our same mistakes."
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/overmap_encounter/planetoid/lava/explored)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/obj/structure/table/reinforced,
/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note{
desc = "It seems like it was written in a hurry";
info = "<i>Hey, you're probably reading this after having killed me, but that's alright. I probably shot first. Names' Yuto, Syndicate Radio Operator, there used to be another op here, a nice one too. Had syndicate command not forgotten about this post, we'd of probably been executed for sentinmental attachments on the job. Although she didn't have to worry about that, the local fauna got her first. I guess this note is my way of saying sorry. Take what you want from this station and my body, you need it more than I do now. Good luck out there, whoever you are. - Syndicate Radio</i><br><br><i>e f.</i>";
default_raw_text = "<i>Hey, you're probably reading this after having killed me, but that's alright. I probably shot first. Names' Yuto, Syndicate Radio Operator, there used to be another op here, a nice one too. Had syndicate command not forgotten about this post, we'd of probably been executed for sentinmental attachments on the job. Although she didn't have to worry about that, the local fauna got her first. I guess this note is my way of saying sorry. Take what you want from this station and my body, you need it more than I do now. Good luck out there, whoever you are. - Syndicate Radio</i><br><br><i>e f.</i>";
pixel_x = -3;
pixel_y = 2
},
Expand Down
Loading

0 comments on commit 9c58a6e

Please sign in to comment.