Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Conversation

@AsV9
Copy link
Contributor

@AsV9 AsV9 commented Nov 19, 2019

Intent of your Pull Request

Basically makes it so that the bridge below xenobio in maints is loaded from a template.
Either you get the normal bridge, or you'll get one that is open to space and has external airlocks in it.

I'm probably eventually going to add more pseudorandom elements to maints, but that'll have to come in a different PR.

Balance thoughts: Well, it shouldn't fuck up anything massively, except you now need external airlock access to get across the space.. You should also be able to get over the space without dying provided you are at high HP when you make your attempt. I was able to do it, anyway. Other than that I think it's probably not a terrible idea to fragment maints a bit more and make them less of a backup hallway and more of a utility area.

Old bridge:
image

New exposed:
image

Changelog

🆑
rscadd: The bridge in maintenance below xenobiology is now sometimes open to space.
/:cl:

@AsV9 AsV9 added Feature This adds new content to the game Mapping Will result in a change to a map. labels Nov 19, 2019
@AsV9 AsV9 requested a review from Ktlwjec as a code owner November 19, 2019 14:13
@AsV9 AsV9 changed the title Xenobio bridge again for real this time Randomizes xenobio bridge Nov 19, 2019
@MegaEmpirical
Copy link

Greytide nerf, I love it.

@SomeguyManperson
Copy link
Contributor

This'll also deal some damage to people being moved through the disposals pipe

@HomocidlePancakes
Copy link

Greytide buff, love it

@yacabo
Copy link
Contributor

yacabo commented Nov 19, 2019

Neat idea, but you really shouldn't need to have an EVA suit to repair a wire that doesn't lead to a sat.

@Hopekz
Copy link
Contributor

Hopekz commented Nov 19, 2019

Good change +1 .
Looking forward to more random maintenance elements.

Can we also look in to putting reinforced windows in the 2 circled places or do you specifically want this area uncrossable without external airlock access or hacking?
I'm fine with hacking these airlocks in open space but I think an unintentional side-effect of this might be people trying to hack these or use them when they're shocked then die because of the stun you get in open space.
image

Might actually just add to the risk of being in maints which I also like.
Actually this might be a good thing regardless if intended.

@Codeatmos
Copy link
Contributor

RNG BAD,BUT YET,THIS CHANGE INTERESTING..

@fluffe9911
Copy link
Contributor

Deja vu

@HomocidlePancakes
Copy link

This'll also deal some damage to people being moved through the disposals pipe

Disposals are not the intended to be a mean transportation

@AsV9
Copy link
Contributor Author

AsV9 commented Nov 20, 2019

@Hopekz I'll add some more windows to make it idiot proof today.

@SomeguyManperson I didn't actually think of that. I'll check how much damage you take in a moment.

EDIT: So I actually just figured out that the disposal line that runs across that bridge is actually the viro/xenobio disposal that goes straight to space. So if you're in that one without wearing a spacesuit in the first place, you're already in big trouble :))

@Bibby0110
Copy link
Contributor

How do shadowmemes get past

@MegaEmpirical
Copy link

MegaEmpirical commented Nov 20, 2019

Go around obviously. That said, they're not simply in space so are they fine?

@Bibby0110
Copy link
Contributor

Well they can't walk through walls in space.
There is no "going around" this is the only link without lights between Viro/medbay maint & science maint

@MegaEmpirical
Copy link

I never said there wouldn't be lights in the way.

@Bibby0110
Copy link
Contributor

So this is a major debuff to shadowmemes, that don't have it easy already

@Hopekz
Copy link
Contributor

Hopekz commented Nov 20, 2019

So this is a major debuff to shadowmemes, that don't have it easy already

After Asv adds the reinforced window to each side per my suggestion this should also as a side effect make shadowlings not nerfed. They'll just be able to cross as per normal then heal up any damage they might receive almost immediately after crossing to the other side through the broken windows.

@Moja10
Copy link
Contributor

Moja10 commented Nov 20, 2019

You should add the shutters with a button to open and close the area to space like it is on Metastation maint, to the west of brig, that way people have the choice to open and close it to space

@MegaEmpirical
Copy link

Doesn't it start open on meta? I always thought it was kind of redundant.

@AsV9
Copy link
Contributor Author

AsV9 commented Nov 20, 2019

So this is a major debuff to shadowmemes, that don't have it easy already

@TheGamerdk Shadowlings get past if they use veil to knock out the rightmost lightbulb. They take like very marginal damage which is nearly instantly healed when they get back into the darkness, so it's actually more like a minor buff to shadowlings.

@Hopekz The windows are in place.

@Darkstick
Copy link
Contributor

Seems like an inconvenience for the sake of it. Makes escaping via maint harder and helps murderers with fast and convenient spacing using medbay maint, with the catwalks and what not.

@Darkstick
Copy link
Contributor

Doesn't it start open on meta? I always thought it was kind of redundant.

Nah, they start closed. I walked through them often, it's usually pressurized.

@Hopekz
Copy link
Contributor

Hopekz commented Nov 20, 2019

@Hopekz The windows are in place.

Don't forget to update your PR original post screenshot so that the discussions can reflect on it being different.

@Lostlarry
Copy link
Contributor

Lostlarry commented Nov 20, 2019

also the bridge is visible from the xeno south cam so ask AI about it if can't be bother to go back for a hard suit

@ThatLing ThatLing added the Controversial People are divided on this PR label Nov 21, 2019
@Amelia0010 Amelia0010 merged commit 27a65e0 into master Nov 22, 2019
@Amelia0010 Amelia0010 deleted the xenobio-bridge-again-for-real-this-time branch November 22, 2019 23:57
@AsV9
Copy link
Contributor Author

AsV9 commented Nov 23, 2019

I swear to fucking god @Nickvr628

SomeguyManperson added a commit to SomeguyManperson/Yogstation that referenced this pull request Nov 26, 2019
* its a bazillion times faster now thanks to asd. no more lag

* Dreamchecker is dumb

* tells it to fuck off on linux

* tells it to fuck off on linux 2

* I just want it to not fail

* MR AZIZ IS GONNA FLIP WHEN HE FINDS OUT ABOUT THESE PIZZAS

* Obsessed people may no longer have the objective to have a picture with the target (yogstation13#7061)

* Automatic changelog generation yogstation13#7061 [ci skip]

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank (yogstation13#7042)

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank

* Update code/game/gamemodes/objective_items.dm

* maybe make sure it works before you push next time, moron

* Update objective_items.dm

* Automatic changelog generation yogstation13#7042 [ci skip]

* War ops less people (yogstation13#7049)

* makes halloween commit

* Update nuclear_challenge.dm

* Update halloween.dm

* Automatic changelog generation yogstation13#7049 [ci skip]

* monkey cube amount (yogstation13#7072)

* haahhhaha

* Update conveyor2.dm

* Update conveyor2.dm

* probably converts achievements to datums and adds database supports

* fix description of bubblegum achievement

* renames SSmedals to SSachievements

* adds apostrophes around SQL value

* possibly creates the schemas?

* forgot semicolons

* changes ckey to name

* adds desc to the database as well

* forgot the id

* fuck

* fixes an apostrophe

* I happen to be a moron

* I am messing with tcomms again

* hivelord legion cant float over tables (yogstation13#7073)

* Automatic changelog generation yogstation13#7073 [ci skip]

* Powerarmor fix (yogstation13#7069)

* Re-adds working hardsuit

* removes broke hardsuit

* Adds working icons

* Working icons

* Fixed stray quotemark

* Automatic changelog generation yogstation13#7069 [ci skip]

* Changes (probably) all the times that Clock Cult uses watts to joules (yogstation13#7052)

* Changes Clock Cult's watts to Joules

Changes (probably) all the times Clock Cult uses the term watts to joules

* Swing and a miss

I missed some

* Automatic changelog generation yogstation13#7052 [ci skip]

* stupid and confusing misname

* Update conveyor2.dm

* adds a cache of achievements to reduce DB calls

* backend ui

* take 2

* prevents xeno pipe evolving

* construction bag now gets more love, can be bought from engi-vend or made with cloth

* fixes Jcat's OCD

bags are now in tens intead of nines

* people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6

* appearance debugging

* RIP shooted

* 21 gun salute

* Update gunpoint.dm

* You can now select exactly which limb was lost in your tragic backstory (yogstation13#7060)

* bubububububububbeatentodeath

* Update negative.dm

* whoops

* reeeeeeeeeeeeeeeee

* Automatic changelog generation yogstation13#7060 [ci skip]

* Surrender text clarity revive (yogstation13#7059)

* Revert "Restoring my main branch"

This reverts commit 39cb232.

* Revert "Revert "Restoring my main branch""

This reverts commit 856950c.

* Revive SurrenderText PR

This PR got closed for a stupid reason then died so I'm bringing it back.
Fixed line endings.

* Makes the text easier to see

Nich brought this up. Valid point. Changed to a very easy to see span.

* Surrendering now has its own span

Per Xoxeyos's suggestion

* Stole Alex's span

Yoink my span nerd

* Automatic changelog generation yogstation13#7059 [ci skip]

* update maps

* fucking tgui

* adds a return so you can't check achivements while they're initializing

* Automatic changelog generation yogstation13#6926 [ci skip]

* Revert "Moving will no longer interrupt breaking out of cuffs"

* Update mobs.dm

* I have no clue how to make tgui work

* why the fuck won't it work

* removes client var for the achievement browser

* tcomms mapping

* fuck

* thank fucking monster for being the only person who could make this work

* fuck

* Revert "Revert "Automatic changelog generation yogstation13#6967 [ci skip]""

This reverts commit 17d9133.

* "overrides the proc" whatever that meant

damn coding conventions

* Dorkspawn are immune to mindswapping (yogstation13#7089)

* fuckkk

* Meatball rename

* Update meatball icon state

* Update construction.dm

* Update forcefieldprojector.dm

* Update construction.dm

* description issues fixed

* spelling error

* removed duplicates

* Strips some input

* fuck

* alcohol bad kids

* Automatic changelog generation yogstation13#7096 [ci skip]

* Revert "Synergy"

* makes magic ball chaplain only

* Adds support for locking holodeck templates to security levels, and locks medical holodeck behind red or delta seclevel.

* Im a moron

* Automatic changelog generation yogstation13#7077 [ci skip]

* Automatic changelog generation yogstation13#7079 [ci skip]

* Automatic changelog generation yogstation13#7093 [ci skip]

* Bridge below xenobio is sometimes open space

* fixes the thing

* cool

* use the real commit

* verified

* Im tired

* Update screen_objects.dm

* Update generic_positive_events.dm

* Update lavaland.dm

* Update human_defense.dm

* Create lovemobile

* Adds the boys

* Images of da bois

* Stuff for da bois

* Screen for da bois

* Actions for da bois

* Convert map to tgm

* Automatic changelog generation yogstation13#7081 [ci skip]

* Automatic changelog generation yogstation13#7084 [ci skip]

* Automatic changelog generation yogstation13#7097 [ci skip]

* Automatic changelog generation yogstation13#7085 [ci skip]

* Adds a list for all the achievements earned during the round

* Makes it a local variable

* gets rid of shuttle_purchase_requirements_met on SSshuttles, since it's redundant now that bubblegum doesn't use it

* Update achievements.ract

* Update viewer.dm

* Update viewer.dm

* Automatic changelog generation yogstation13#7104 [ci skip]

* Fixes oopsie

* i am retard

* holy fuck it works

* brubrubrubrubrubrubruburburubruh

* cdfhjksfvgasdfhav

* health is reduced to 200 on revival instead of 400

* stupid intercom nonsense

* change descriptions

* update

* description

* let's not be rash

* eeeeeeeeeeeeeeeee

* hope gives minor armor same as talisman/codpiece

* Update holidays.dm

* Update holidays.dm

* Add a couple of windows.

* Update tgstation_schema.sql

* Update tgstation_schema_prefixed.sql

* Update achievements.dm

* THE GREAT TG MUTATION PORT (yogstation13#7035)

* makes halloween commit

* the great mutation port

* Update _combined.dm

* hhahahahah

* Update dna_injector.dm

* fggffdds

* Update DNA.dm

* Automatic changelog generation yogstation13#7035 [ci skip]

* Actually placed the window in a usable spot.

* point of no return to stop reaction spam

* Update necropolis_chests.dm

* Update halloween.dm

* more

* should fix it

* Update achievements.dm

* I don't get why this doesn't work as is, but oh well

* fuck

* fixes my stupid asshattery

* Update holidays.dm

* Automatic changelog generation yogstation13#7015 [ci skip]

* Automatic changelog generation yogstation13#7102 [ci skip]

* Automatic changelog generation yogstation13#7106 [ci skip]

* Automatic changelog generation yogstation13#7121 [ci skip]

* for nich

* Update rune.dm

* Automatic changelog generation yogstation13#7103 [ci skip]

* Automatic changelog generation yogstation13#7114 [ci skip]

* Automatic changelog generation yogstation13#7078 [ci skip]

* Automatic changelog generation yogstation13#7070 [ci skip]

* Changelog Compilation 21/11/2019 [ci skip]

* Update holidays.dm

* Update holidays.dm

* fuck

* layers pipes

* removed dsi song sadly

* [s] fuck

* Delete weapons.dmi

* Adds a map of the station to players' boxes

* W I N G S

* fuck

* I am going to keep this to force someone to make better sprites

* Update necropolis_chests.dm

* Minor grammatical and spelling fixes across the codebase

* Automatic changelog generation yogstation13#7051 [ci skip]

* Automatic changelog generation yogstation13#7120 [ci skip]

* Automatic changelog generation yogstation13#7065 [ci skip]

* Automatic changelog generation yogstation13#7111 [ci skip]

* i hate spam clicking

* Automatic changelog generation yogstation13#7133 [ci skip]

* f

* woops

* f

* woops2

* f

* f

* I think this fixes disabler cooler

* Automatic changelog generation yogstation13#7148 [ci skip]

* Automatic changelog generation yogstation13#7136 [ci skip]

* Automatic changelog generation yogstation13#7132 [ci skip]

* umbral tendrils can chain easier (yogstation13#7152)

* Automatic changelog generation yogstation13#7134 [ci skip]

* Automatic changelog generation yogstation13#7141 [ci skip]

* Automatic changelog generation yogstation13#7147 [ci skip]

* Automatic changelog generation yogstation13#7144 [ci skip]

* Automatic changelog generation yogstation13#7146 [ci skip]

* Automatic changelog generation yogstation13#7145 [ci skip]

* darkspawn time dilation now actually ignores slowdown (yogstation13#7155)
alexkar598 pushed a commit that referenced this pull request Nov 30, 2019
* E (#11)

* its a bazillion times faster now thanks to asd. no more lag

* Dreamchecker is dumb

* tells it to fuck off on linux

* tells it to fuck off on linux 2

* I just want it to not fail

* MR AZIZ IS GONNA FLIP WHEN HE FINDS OUT ABOUT THESE PIZZAS

* Obsessed people may no longer have the objective to have a picture with the target (#7061)

* Automatic changelog generation #7061 [ci skip]

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank (#7042)

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank

* Update code/game/gamemodes/objective_items.dm

* maybe make sure it works before you push next time, moron

* Update objective_items.dm

* Automatic changelog generation #7042 [ci skip]

* War ops less people (#7049)

* makes halloween commit

* Update nuclear_challenge.dm

* Update halloween.dm

* Automatic changelog generation #7049 [ci skip]

* monkey cube amount (#7072)

* haahhhaha

* Update conveyor2.dm

* Update conveyor2.dm

* probably converts achievements to datums and adds database supports

* fix description of bubblegum achievement

* renames SSmedals to SSachievements

* adds apostrophes around SQL value

* possibly creates the schemas?

* forgot semicolons

* changes ckey to name

* adds desc to the database as well

* forgot the id

* fuck

* fixes an apostrophe

* I happen to be a moron

* I am messing with tcomms again

* hivelord legion cant float over tables (#7073)

* Automatic changelog generation #7073 [ci skip]

* Powerarmor fix (#7069)

* Re-adds working hardsuit

* removes broke hardsuit

* Adds working icons

* Working icons

* Fixed stray quotemark

* Automatic changelog generation #7069 [ci skip]

* Changes (probably) all the times that Clock Cult uses watts to joules (#7052)

* Changes Clock Cult's watts to Joules

Changes (probably) all the times Clock Cult uses the term watts to joules

* Swing and a miss

I missed some

* Automatic changelog generation #7052 [ci skip]

* stupid and confusing misname

* Update conveyor2.dm

* adds a cache of achievements to reduce DB calls

* backend ui

* take 2

* prevents xeno pipe evolving

* construction bag now gets more love, can be bought from engi-vend or made with cloth

* fixes Jcat's OCD

bags are now in tens intead of nines

* people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6

* appearance debugging

* RIP shooted

* 21 gun salute

* Update gunpoint.dm

* You can now select exactly which limb was lost in your tragic backstory (#7060)

* bubububububububbeatentodeath

* Update negative.dm

* whoops

* reeeeeeeeeeeeeeeee

* Automatic changelog generation #7060 [ci skip]

* Surrender text clarity revive (#7059)

* Revert "Restoring my main branch"

This reverts commit 39cb232.

* Revert "Revert "Restoring my main branch""

This reverts commit 856950c.

* Revive SurrenderText PR

This PR got closed for a stupid reason then died so I'm bringing it back.
Fixed line endings.

* Makes the text easier to see

Nich brought this up. Valid point. Changed to a very easy to see span.

* Surrendering now has its own span

Per Xoxeyos's suggestion

* Stole Alex's span

Yoink my span nerd

* Automatic changelog generation #7059 [ci skip]

* update maps

* fucking tgui

* adds a return so you can't check achivements while they're initializing

* Automatic changelog generation #6926 [ci skip]

* Revert "Moving will no longer interrupt breaking out of cuffs"

* Update mobs.dm

* I have no clue how to make tgui work

* why the fuck won't it work

* removes client var for the achievement browser

* tcomms mapping

* fuck

* thank fucking monster for being the only person who could make this work

* fuck

* Revert "Revert "Automatic changelog generation #6967 [ci skip]""

This reverts commit 17d9133.

* "overrides the proc" whatever that meant

damn coding conventions

* Dorkspawn are immune to mindswapping (#7089)

* fuckkk

* Meatball rename

* Update meatball icon state

* Update construction.dm

* Update forcefieldprojector.dm

* Update construction.dm

* description issues fixed

* spelling error

* removed duplicates

* Strips some input

* fuck

* alcohol bad kids

* Automatic changelog generation #7096 [ci skip]

* Revert "Synergy"

* makes magic ball chaplain only

* Adds support for locking holodeck templates to security levels, and locks medical holodeck behind red or delta seclevel.

* Im a moron

* Automatic changelog generation #7077 [ci skip]

* Automatic changelog generation #7079 [ci skip]

* Automatic changelog generation #7093 [ci skip]

* Bridge below xenobio is sometimes open space

* fixes the thing

* cool

* use the real commit

* verified

* Im tired

* Update screen_objects.dm

* Update generic_positive_events.dm

* Update lavaland.dm

* Update human_defense.dm

* Create lovemobile

* Adds the boys

* Images of da bois

* Stuff for da bois

* Screen for da bois

* Actions for da bois

* Convert map to tgm

* Automatic changelog generation #7081 [ci skip]

* Automatic changelog generation #7084 [ci skip]

* Automatic changelog generation #7097 [ci skip]

* Automatic changelog generation #7085 [ci skip]

* Adds a list for all the achievements earned during the round

* Makes it a local variable

* gets rid of shuttle_purchase_requirements_met on SSshuttles, since it's redundant now that bubblegum doesn't use it

* Update achievements.ract

* Update viewer.dm

* Update viewer.dm

* Automatic changelog generation #7104 [ci skip]

* Fixes oopsie

* i am retard

* holy fuck it works

* brubrubrubrubrubrubruburburubruh

* cdfhjksfvgasdfhav

* health is reduced to 200 on revival instead of 400

* stupid intercom nonsense

* change descriptions

* update

* description

* let's not be rash

* eeeeeeeeeeeeeeeee

* hope gives minor armor same as talisman/codpiece

* Update holidays.dm

* Update holidays.dm

* Add a couple of windows.

* Update tgstation_schema.sql

* Update tgstation_schema_prefixed.sql

* Update achievements.dm

* THE GREAT TG MUTATION PORT (#7035)

* makes halloween commit

* the great mutation port

* Update _combined.dm

* hhahahahah

* Update dna_injector.dm

* fggffdds

* Update DNA.dm

* Automatic changelog generation #7035 [ci skip]

* Actually placed the window in a usable spot.

* point of no return to stop reaction spam

* Update necropolis_chests.dm

* Update halloween.dm

* more

* should fix it

* Update achievements.dm

* I don't get why this doesn't work as is, but oh well

* fuck

* fixes my stupid asshattery

* Update holidays.dm

* Automatic changelog generation #7015 [ci skip]

* Automatic changelog generation #7102 [ci skip]

* Automatic changelog generation #7106 [ci skip]

* Automatic changelog generation #7121 [ci skip]

* for nich

* Update rune.dm

* Automatic changelog generation #7103 [ci skip]

* Automatic changelog generation #7114 [ci skip]

* Automatic changelog generation #7078 [ci skip]

* Automatic changelog generation #7070 [ci skip]

* Changelog Compilation 21/11/2019 [ci skip]

* Update holidays.dm

* Update holidays.dm

* fuck

* layers pipes

* removed dsi song sadly

* [s] fuck

* Delete weapons.dmi

* Adds a map of the station to players' boxes

* W I N G S

* fuck

* I am going to keep this to force someone to make better sprites

* Update necropolis_chests.dm

* Minor grammatical and spelling fixes across the codebase

* Automatic changelog generation #7051 [ci skip]

* Automatic changelog generation #7120 [ci skip]

* Automatic changelog generation #7065 [ci skip]

* Automatic changelog generation #7111 [ci skip]

* i hate spam clicking

* Automatic changelog generation #7133 [ci skip]

* f

* woops

* f

* woops2

* f

* f

* I think this fixes disabler cooler

* Automatic changelog generation #7148 [ci skip]

* Automatic changelog generation #7136 [ci skip]

* Automatic changelog generation #7132 [ci skip]

* umbral tendrils can chain easier (#7152)

* Automatic changelog generation #7134 [ci skip]

* Automatic changelog generation #7141 [ci skip]

* Automatic changelog generation #7147 [ci skip]

* Automatic changelog generation #7144 [ci skip]

* Automatic changelog generation #7146 [ci skip]

* Automatic changelog generation #7145 [ci skip]

* darkspawn time dilation now actually ignores slowdown (#7155)

* Revert "E (#11)" (#12)

This reverts commit 73e185a.

* baddna comes first
Amelia0010 pushed a commit that referenced this pull request Jan 2, 2020
* E (#11)

* its a bazillion times faster now thanks to asd. no more lag

* Dreamchecker is dumb

* tells it to fuck off on linux

* tells it to fuck off on linux 2

* I just want it to not fail

* MR AZIZ IS GONNA FLIP WHEN HE FINDS OUT ABOUT THESE PIZZAS

* Obsessed people may no longer have the objective to have a picture with the target (#7061)

* Automatic changelog generation #7061 [ci skip]

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank (#7042)

* Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank

* Update code/game/gamemodes/objective_items.dm

* maybe make sure it works before you push next time, moron

* Update objective_items.dm

* Automatic changelog generation #7042 [ci skip]

* War ops less people (#7049)

* makes halloween commit

* Update nuclear_challenge.dm

* Update halloween.dm

* Automatic changelog generation #7049 [ci skip]

* monkey cube amount (#7072)

* haahhhaha

* Update conveyor2.dm

* Update conveyor2.dm

* probably converts achievements to datums and adds database supports

* fix description of bubblegum achievement

* renames SSmedals to SSachievements

* adds apostrophes around SQL value

* possibly creates the schemas?

* forgot semicolons

* changes ckey to name

* adds desc to the database as well

* forgot the id

* fuck

* fixes an apostrophe

* I happen to be a moron

* I am messing with tcomms again

* hivelord legion cant float over tables (#7073)

* Automatic changelog generation #7073 [ci skip]

* Powerarmor fix (#7069)

* Re-adds working hardsuit

* removes broke hardsuit

* Adds working icons

* Working icons

* Fixed stray quotemark

* Automatic changelog generation #7069 [ci skip]

* Changes (probably) all the times that Clock Cult uses watts to joules (#7052)

* Changes Clock Cult's watts to Joules

Changes (probably) all the times Clock Cult uses the term watts to joules

* Swing and a miss

I missed some

* Automatic changelog generation #7052 [ci skip]

* stupid and confusing misname

* Update conveyor2.dm

* adds a cache of achievements to reduce DB calls

* backend ui

* take 2

* prevents xeno pipe evolving

* construction bag now gets more love, can be bought from engi-vend or made with cloth

* fixes Jcat's OCD

bags are now in tens intead of nines

* people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6

* appearance debugging

* RIP shooted

* 21 gun salute

* Update gunpoint.dm

* You can now select exactly which limb was lost in your tragic backstory (#7060)

* bubububububububbeatentodeath

* Update negative.dm

* whoops

* reeeeeeeeeeeeeeeee

* Automatic changelog generation #7060 [ci skip]

* Surrender text clarity revive (#7059)

* Revert "Restoring my main branch"

This reverts commit 39cb232.

* Revert "Revert "Restoring my main branch""

This reverts commit 856950c.

* Revive SurrenderText PR

This PR got closed for a stupid reason then died so I'm bringing it back.
Fixed line endings.

* Makes the text easier to see

Nich brought this up. Valid point. Changed to a very easy to see span.

* Surrendering now has its own span

Per Xoxeyos's suggestion

* Stole Alex's span

Yoink my span nerd

* Automatic changelog generation #7059 [ci skip]

* update maps

* fucking tgui

* adds a return so you can't check achivements while they're initializing

* Automatic changelog generation #6926 [ci skip]

* Revert "Moving will no longer interrupt breaking out of cuffs"

* Update mobs.dm

* I have no clue how to make tgui work

* why the fuck won't it work

* removes client var for the achievement browser

* tcomms mapping

* fuck

* thank fucking monster for being the only person who could make this work

* fuck

* Revert "Revert "Automatic changelog generation #6967 [ci skip]""

This reverts commit 17d9133.

* "overrides the proc" whatever that meant

damn coding conventions

* Dorkspawn are immune to mindswapping (#7089)

* fuckkk

* Meatball rename

* Update meatball icon state

* Update construction.dm

* Update forcefieldprojector.dm

* Update construction.dm

* description issues fixed

* spelling error

* removed duplicates

* Strips some input

* fuck

* alcohol bad kids

* Automatic changelog generation #7096 [ci skip]

* Revert "Synergy"

* makes magic ball chaplain only

* Adds support for locking holodeck templates to security levels, and locks medical holodeck behind red or delta seclevel.

* Im a moron

* Automatic changelog generation #7077 [ci skip]

* Automatic changelog generation #7079 [ci skip]

* Automatic changelog generation #7093 [ci skip]

* Bridge below xenobio is sometimes open space

* fixes the thing

* cool

* use the real commit

* verified

* Im tired

* Update screen_objects.dm

* Update generic_positive_events.dm

* Update lavaland.dm

* Update human_defense.dm

* Create lovemobile

* Adds the boys

* Images of da bois

* Stuff for da bois

* Screen for da bois

* Actions for da bois

* Convert map to tgm

* Automatic changelog generation #7081 [ci skip]

* Automatic changelog generation #7084 [ci skip]

* Automatic changelog generation #7097 [ci skip]

* Automatic changelog generation #7085 [ci skip]

* Adds a list for all the achievements earned during the round

* Makes it a local variable

* gets rid of shuttle_purchase_requirements_met on SSshuttles, since it's redundant now that bubblegum doesn't use it

* Update achievements.ract

* Update viewer.dm

* Update viewer.dm

* Automatic changelog generation #7104 [ci skip]

* Fixes oopsie

* i am retard

* holy fuck it works

* brubrubrubrubrubrubruburburubruh

* cdfhjksfvgasdfhav

* health is reduced to 200 on revival instead of 400

* stupid intercom nonsense

* change descriptions

* update

* description

* let's not be rash

* eeeeeeeeeeeeeeeee

* hope gives minor armor same as talisman/codpiece

* Update holidays.dm

* Update holidays.dm

* Add a couple of windows.

* Update tgstation_schema.sql

* Update tgstation_schema_prefixed.sql

* Update achievements.dm

* THE GREAT TG MUTATION PORT (#7035)

* makes halloween commit

* the great mutation port

* Update _combined.dm

* hhahahahah

* Update dna_injector.dm

* fggffdds

* Update DNA.dm

* Automatic changelog generation #7035 [ci skip]

* Actually placed the window in a usable spot.

* point of no return to stop reaction spam

* Update necropolis_chests.dm

* Update halloween.dm

* more

* should fix it

* Update achievements.dm

* I don't get why this doesn't work as is, but oh well

* fuck

* fixes my stupid asshattery

* Update holidays.dm

* Automatic changelog generation #7015 [ci skip]

* Automatic changelog generation #7102 [ci skip]

* Automatic changelog generation #7106 [ci skip]

* Automatic changelog generation #7121 [ci skip]

* for nich

* Update rune.dm

* Automatic changelog generation #7103 [ci skip]

* Automatic changelog generation #7114 [ci skip]

* Automatic changelog generation #7078 [ci skip]

* Automatic changelog generation #7070 [ci skip]

* Changelog Compilation 21/11/2019 [ci skip]

* Update holidays.dm

* Update holidays.dm

* fuck

* layers pipes

* removed dsi song sadly

* [s] fuck

* Delete weapons.dmi

* Adds a map of the station to players' boxes

* W I N G S

* fuck

* I am going to keep this to force someone to make better sprites

* Update necropolis_chests.dm

* Minor grammatical and spelling fixes across the codebase

* Automatic changelog generation #7051 [ci skip]

* Automatic changelog generation #7120 [ci skip]

* Automatic changelog generation #7065 [ci skip]

* Automatic changelog generation #7111 [ci skip]

* i hate spam clicking

* Automatic changelog generation #7133 [ci skip]

* f

* woops

* f

* woops2

* f

* f

* I think this fixes disabler cooler

* Automatic changelog generation #7148 [ci skip]

* Automatic changelog generation #7136 [ci skip]

* Automatic changelog generation #7132 [ci skip]

* umbral tendrils can chain easier (#7152)

* Automatic changelog generation #7134 [ci skip]

* Automatic changelog generation #7141 [ci skip]

* Automatic changelog generation #7147 [ci skip]

* Automatic changelog generation #7144 [ci skip]

* Automatic changelog generation #7146 [ci skip]

* Automatic changelog generation #7145 [ci skip]

* darkspawn time dilation now actually ignores slowdown (#7155)

* Revert "E (#11)" (#12)

This reverts commit 73e185a.

* what hath god wrought

* unrequired
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Controversial People are divided on this PR Feature This adds new content to the game Mapping Will result in a change to a map.

Projects

None yet

Development

Successfully merging this pull request may close these issues.