Adds some stuff to charlie station #12659

redmoogle · 2021-11-14T20:24:33Z

Document the changes in your pull request

Adds a thing of cable coils by medical maint
stuffs the PA in a crate
Removes the transport pod for a bridge
Makes the science room slighty bigger
Makes the security room slightly smaller
Adds a small randomized maint loot
gets rid of unbreakable rocks
fixes two vents being off
removes random unconnected wire

Why?

Well; The issue is that the pod gets in the way alot and so I changed it to a foot bridge which caused me to need to realign some stuff which is why theres now two maint rooms

I also included three fixes because why not

Wiki Documentation

Just remove the part saying they're connected by transit tubes

Changelog

🆑
rscadd: Removes the pod from charlie and adds a bridge instead
tweak: Stuff the PA in charlie station into a crate
tweak: Adds another pack of cable coils to charlie station
bugfix: Fixes some issues on charlie station
/:cl:

patpol4 · 2021-11-14T21:21:05Z

Why?
Also include the wiki part

redmoogle · 2021-11-14T21:24:28Z

Why? Also include the wiki part

added one stack of cable coils because you kinda run out
added a bridge because pod is annoying and weird
PA just takes up alot of unneeded room
The rest is to make the alignment work

Moggram · 2021-11-15T09:36:05Z

The AI core is now open to space.
You need to add some stuff in the new maintenance rooms so they are not empty.

commit 91097e5 Author: Yogbot-13 <admin@yogstation.net> Date: Mon Nov 15 04:57:29 2021 -0500 Automatic changelog generation #12668 [ci skip] commit e264a66 Author: Theos <theubernyan@gmail.com> Date: Mon Nov 15 04:57:27 2021 -0500 Update datumvars.dm (#12668) commit 85cd07f Author: Yogbot-13 <admin@yogstation.net> Date: Mon Nov 15 03:43:19 2021 -0500 Automatic changelog generation #12666 [ci skip] commit cbf8aca Author: nmajask <nmajask@gmail.com> Date: Mon Nov 15 03:43:17 2021 -0500 Should fix head modular consoles missing some programs (#12666) * *scream why cant I code * Why did this not exist originally *scream commit c7f2b73 Author: nmajask <nmajask@gmail.com> Date: Mon Nov 15 03:32:00 2021 -0500 Update AutoChangelog-pr-12627.yml (#12667) aaaa commit 16c5781 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:54 2021 -0500 Automatic changelog generation #12651 [ci skip] commit dda496c Author: adamsong <adamsong@users.noreply.github.com> Date: Sun Nov 14 12:26:52 2021 -0600 Fixes bug in admin ticket panel (#12651) commit 89df547 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:44 2021 -0500 Automatic changelog generation #12650 [ci skip] commit ec88cfc Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 13:26:42 2021 -0500 clock armor fix (#12650) commit b530715 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:26:28 2021 -0500 Automatic changelog generation #12622 [ci skip] commit 150df7b Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 10:26:26 2021 -0800 Adds hawaiian shirt to the vending machine (#12622) * Adds hawaiian shirt to the vending machine * Update code/modules/vending/clothesmate.dm Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com> commit 3af62cb Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:21:27 2021 -0500 Automatic changelog generation #12646 [ci skip] commit 87106c0 Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 10:21:26 2021 -0800 Adds the poppy pin (#12646) commit 71d4076 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:19:49 2021 -0500 Automatic changelog generation #12644 [ci skip] commit 33b4803 Author: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sun Nov 14 10:19:47 2021 -0800 Update felinid.dm (#12644) commit 8485cbb Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:19:07 2021 -0500 Automatic changelog generation #12643 [ci skip] commit 711733e Author: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sun Nov 14 10:19:05 2021 -0800 Update chem_dispenser.dm (#12643) commit 7be21bc Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:16:15 2021 -0500 Automatic changelog generation #12634 [ci skip] commit e5123ec Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:16:13 2021 -0800 Update holidays.dm (#12634) commit 27857f1 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:15:56 2021 -0500 Automatic changelog generation #12633 [ci skip] commit eb1d89b Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:15:54 2021 -0800 Update holidays.dm (#12633) commit a64ef3b Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:14:34 2021 -0500 Automatic changelog generation #12631 [ci skip] commit d2c8fe6 Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:14:33 2021 -0800 Update holidays.dm (#12631) commit 886cee8 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:14:11 2021 -0500 Automatic changelog generation #12630 [ci skip] commit b3e14b7 Author: Xoxeyos <39686570+Xoxeyos@users.noreply.github.com> Date: Sun Nov 14 10:14:09 2021 -0800 Update holidays.dm (#12630) commit a1adc40 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:12:44 2021 -0500 Automatic changelog generation #12627 [ci skip] commit 2e554ce Author: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Sun Nov 14 13:12:41 2021 -0500 Update dna.dm (#12627) commit 60b4960 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:12:18 2021 -0500 Automatic changelog generation #12625 [ci skip] commit 815530a Author: Redmoogle <dakotamew@gmail.com> Date: Sun Nov 14 13:12:16 2021 -0500 Changes the recharger sprites slightly and change them to use gradients (#12625) * Changes the sprite a little and uses gradients * Makes the icon update more snappy * removes the unused * Update stationobjs.dmi commit 4847d41 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:08:43 2021 -0500 Automatic changelog generation #12620 [ci skip] commit 17a0585 Author: KillerOrcaCora <82983051+KillerOrcaCora@users.noreply.github.com> Date: Sun Nov 14 13:08:41 2021 -0500 Scientist Skill Cape Update! *Improved* (#12620) * Update skillcapes.dmi * Create Scicape.dmi * Update skillcapes.dmi * Revert "Create Scicape.dmi" This reverts commit d61c13a. * Update skillcapes.dmi * Update skillcapes.dmi * Update neck.dmi commit 958b4a0 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:06:38 2021 -0500 Automatic changelog generation #12616 [ci skip] commit 2c20e62 Author: Theos <theubernyan@gmail.com> Date: Sun Nov 14 13:06:37 2021 -0500 makes generic bleedstacks stack (#12616) commit d2bacbf Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:04:32 2021 -0500 Automatic changelog generation #12612 [ci skip] commit 5facfd1 Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 13:04:30 2021 -0500 taser spit funny (#12612) Co-authored-by: Theos <theubernyan@gmail.com> commit 07370dc Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:03:41 2021 -0500 Automatic changelog generation #12611 [ci skip] commit 1960619 Author: Theos <theubernyan@gmail.com> Date: Sun Nov 14 13:03:39 2021 -0500 Removes overthrow (#12611) * it's gone * adios * this mode sucks * adios * goodbye * gone * it's fiction * Update antagonists.dm * adios * Update ai_laws.dm * it's gone * gone, reduced to atoms commit 3bc9d5c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:02:09 2021 -0500 Automatic changelog generation #12607 [ci skip] commit 6ad7aa0 Author: Marmio64 <60946370+Marmio64@users.noreply.github.com> Date: Sun Nov 14 12:02:07 2021 -0600 ashwalker - the resin expansion (#12607) * ashwalker resin expansion * resin statue * Update code/modules/reagents/chemistry/recipes/others.dm Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> * fix? * makes statue look a tiny bit better * resin slightly less dangerous and less rng dependant, fixed statues Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> commit 1221822 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 13:01:37 2021 -0500 Automatic changelog generation #12605 [ci skip] commit cfbf1d9 Author: Lucy <lucy@absolucy.moe> Date: Sun Nov 14 13:01:35 2021 -0500 Toilet bong (#12605) * Adds the toilet bong * Update icon after smoking commit 481ab9a Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:59:57 2021 -0500 Automatic changelog generation #12601 [ci skip] commit 0d387d6 Author: nmajask <nmajask@gmail.com> Date: Sun Nov 14 12:59:55 2021 -0500 Ports "Makes alarm manager update even while off and fire alarms clear" #4561 (#12601) * Ported "Makes alarm manager update even while off and fire alarms clear" Ported "Makes alarm manager update even while off and fire alarms clear" #4561 by lordScrubling from BeeStation * Forgot this i suck at coding commit af6402c Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:58:45 2021 -0500 Automatic changelog generation #12593 [ci skip] commit c6ca1cb Author: AlvCyktor <81328245+AlvCyktor@users.noreply.github.com> Date: Sun Nov 14 09:58:43 2021 -0800 Operation Spaghonut: Commence Spaghetti (#12593) * Adds spaghonut * added recipe and bugifx * fix? * fixes spelling * this should fix the bugs * adds sprite for donuts and also adds jelly spagonut * Update code/modules/food_and_drinks/food/snacks_pastry.dm Co-authored-by: Theos <theubernyan@gmail.com> * Update code/modules/food_and_drinks/food/snacks_pastry.dm Co-authored-by: Theos <theubernyan@gmail.com> Co-authored-by: Theos <theubernyan@gmail.com> commit c9614f6 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:57:30 2021 -0500 Automatic changelog generation #12588 [ci skip] commit 702d1ef Author: nmajask <nmajask@gmail.com> Date: Sun Nov 14 12:57:28 2021 -0500 Replaces some consoles with modular computer consoles (#12588) * Added more presets Added more mod console presets for sec, tcomms, cargo, qm, mining, HoP, HoS, CE, RD, and CMO * Adds the consoles presets to the maps * Few tweaks Forgot to change what the tcomms preset had * Tweaked kilo robotics * Made a few more tweaks to kilo * Re-added the outpost cameras instead of the mining preset commit 7b0217f Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:57:05 2021 -0500 Automatic changelog generation #12586 [ci skip] commit 456c0ac Author: Gary Lafortune <mom-puter@hotmail.com> Date: Sun Nov 14 11:57:03 2021 -0600 Refactors the Telecomms log browser computer with fancy TGUI UI (#12586) * Refactors the telecomm log computer's GUI Specifically this is the computer that handles showing the radio logs, not the PDA ones. * Adds the darn delete buttons for the log browser Forgot to add these, christ also cleans up the padding & margins for log entries * Resolves all TGUI linter complaints * Makes NTSL runtimes display a bit nicer I could touch this up all day but I got shit to do and hoes to screw * You didn't see that * I hate whitespace linting so much * Adds (mostly pointless) Refresh button to Log Browser * The new Log Browser now respects language comprehension commit b4d4007 Author: Yogbot-13 <admin@yogstation.net> Date: Sun Nov 14 12:56:32 2021 -0500 Automatic changelog generation #12581 [ci skip] commit bef12c6 Author: ynot01 <ynot000001@gmail.com> Date: Sun Nov 14 12:56:31 2021 -0500 Update nukeop.dm (#12581)

This reverts commit 68ea873.

Chubbygummibear · 2021-11-15T18:04:37Z

Something important to note, I'm pretty sure you bulldozed through one of the 4 bluespace crystal spawns with the footbridge. I recently learned there are 4 distinct spawns, but you need 5 to make a functional teleporter.

So if I may make a suggestion, re-add the bluespace crystal spawn, and maybe add a few diamonds to one of the bridge crates so it's feasible to make artificial bluespace crystals without hoping for a lucky diamond ore spawn for the 5th crystal.

That aside, love to see ghost role love bless up

…le rocks

redmoogle · 2021-11-15T23:05:27Z

Something important to note, I'm pretty sure you bulldozed through one of the 4 bluespace crystal spawns with the footbridge. I recently learned there are 4 distinct spawns, but you need 5 to make a functional teleporter.

So if I may make a suggestion, re-add the bluespace crystal spawn, and maybe add a few diamonds to one of the bridge crates so it's feasible to make artificial bluespace crystals without hoping for a lucky diamond ore spawn for the 5th crystal.

That aside, love to see ghost role love bless up

Readded that one crystal and also put down an diamond asteroid tile

_maps/RandomRuins/SpaceRuins/oldstation.dmm

patpol4

Plant is fine but what is the cobweb hanging onto?
I don't get the point of this change

Other than this and the maintanace stuff, this is very nice.

redmoogle · 2021-11-16T12:05:59Z

Plant is fine but what is the cobweb hanging onto?

I don't get the point of this change

Other than this and the maintanace stuff, this is very nice.

1 oop

2 those were indestructible turfs and changed it to look like an actual maint/storage room

patpol4 · 2021-11-17T10:54:20Z

just the maint typos now and its good to go

redmoogle · 2021-11-17T11:16:46Z

just the maint typos now and its good to go

fixed

patpol4

Is good

Bridges the pod

a05a630

redmoogle requested a review from a team as a code owner November 14, 2021 20:24

Yogbot-13 added Feature This adds new content to the game Mapping Will result in a change to a map. Tweak This PR contains changes to the game. labels Nov 14, 2021

area fixes

f09ea5a

patpol4 added the Missing/Inadequate Rationale This pr is missing a 'why is this good for the game' section or it is inadequate label Nov 14, 2021

Redmoogle added 2 commits November 15, 2021 05:44

fixes AI being exposed

8df4e8b

redmoogle requested a review from a team as a code owner November 15, 2021 10:44

Redmoogle added 2 commits November 15, 2021 05:45

Revert "Squashed commit of the following:"

3e80f98

This reverts commit 68ea873.

Merge remote-tracking branch 'upstream/master' into charliemappin

e7bbe62

Redmoogle added 2 commits November 15, 2021 17:56

Area fixes, a little bit of maint loot, pump fixes, removes unbreakab…

fa99ba8

…le rocks

Catwalks and tile under broken wall

b18b0da

random double wire under a solar panel

5c80424

patpol4 reviewed Nov 16, 2021

View reviewed changes

_maps/RandomRuins/SpaceRuins/oldstation.dmm Outdated Show resolved Hide resolved

patpol4 reviewed Nov 16, 2021

View reviewed changes

_maps/RandomRuins/SpaceRuins/oldstation.dmm Outdated Show resolved Hide resolved

patpol4 suggested changes Nov 16, 2021

View reviewed changes

fixed random cobweb

5f0e737

patpol4 added Awaiting - Action - Author This PR is awaiting an action from the author and removed Missing/Inadequate Rationale This pr is missing a 'why is this good for the game' section or it is inadequate labels Nov 16, 2021

renames the doors

2bd9d77

patpol4 approved these changes Nov 17, 2021

View reviewed changes

patpol4 removed the request for review from a team November 17, 2021 11:24

patpol4 merged commit a7e677a into yogstation13:master Nov 17, 2021

Yogbot-13 added the Fix This fixes an issue. Please link issues in fix PRs label Nov 17, 2021

Yogbot-13 added a commit that referenced this pull request Nov 17, 2021

Automatic changelog generation #12659 [ci skip]

1bc8842

redmoogle deleted the charliemappin branch December 6, 2021 14:48

Chubbygummibear mentioned this pull request Dec 17, 2021

Fix Charlie Station bridge wiring #12916

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Adds some stuff to charlie station #12659

Adds some stuff to charlie station #12659

Uh oh!

redmoogle commented Nov 14, 2021 •

edited

Loading

Uh oh!

patpol4 commented Nov 14, 2021 •

edited

Loading

Uh oh!

redmoogle commented Nov 14, 2021

Uh oh!

Moggram commented Nov 15, 2021 •

edited

Loading

Uh oh!

Chubbygummibear commented Nov 15, 2021

Uh oh!

redmoogle commented Nov 15, 2021

Uh oh!

Uh oh!

Uh oh!

patpol4 left a comment

Uh oh!

redmoogle commented Nov 16, 2021

Uh oh!

patpol4 commented Nov 17, 2021

Uh oh!

redmoogle commented Nov 17, 2021

Uh oh!

patpol4 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Adds some stuff to charlie station #12659

Adds some stuff to charlie station #12659

Uh oh!

Conversation

redmoogle commented Nov 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Document the changes in your pull request

Why?

Wiki Documentation

Changelog

Uh oh!

patpol4 commented Nov 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

redmoogle commented Nov 14, 2021

Uh oh!

Moggram commented Nov 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Chubbygummibear commented Nov 15, 2021

Uh oh!

redmoogle commented Nov 15, 2021

Uh oh!

Uh oh!

Uh oh!

patpol4 left a comment

Choose a reason for hiding this comment

Uh oh!

redmoogle commented Nov 16, 2021

Uh oh!

patpol4 commented Nov 17, 2021

Uh oh!

redmoogle commented Nov 17, 2021

Uh oh!

patpol4 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

redmoogle commented Nov 14, 2021 •

edited

Loading

patpol4 commented Nov 14, 2021 •

edited

Loading

Moggram commented Nov 15, 2021 •

edited

Loading