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

makes it harder for the hos to break into science by upping security a little bit #14639

Merged
Bibby0110 merged 1 commit into from
Jun 28, 2022
Merged

makes it harder for the hos to break into science by upping security a little bit #14639

Bibby0110 merged 1 commit into from
Jun 28, 2022

Conversation

@Bibby0110
Copy link
Contributor

@Bibby0110 Bibby0110 commented Jun 28, 2022

lol

@Bibby0110 Bibby0110 requested a review from a team as a code owner June 28, 2022 19:59
@Yogbot-13 Yogbot-13 added the Mapping Will result in a change to a map. label Jun 28, 2022
@Bibby0110 Bibby0110 merged commit ad4e916 into mastеr Jun 28, 2022
@Bibby0110 Bibby0110 deleted the fdmm-patch-82403563-TheGamerdk branch June 28, 2022 19:59
KillerOrcaCora pushed a commit that referenced this pull request Jul 16, 2022
@VaelophisNyx @Bibby0110
Adds new Lavaland Biodome Ghost Spawn: The Fisherman, in a Fishing Pi…
8ef20ee 
…er Biodome (#14746)

* e (#14639)

* Initial commit. Add map, spawns, fix fishing vendor.

need new sprite for the fishing vendor restock.

* e

* Boat can now do water!

splish splash

* fishermen can now access their own shutters and lockdowns

:)

* north entrance exists now

e

* fix button access for real this time

fastdmm I hate you

* less vendors, moved some stuff

* updates that one table to be wood

now its less ugly?

* uses the new donkpocket spawner

RNG donks lets go

* fishing restock finally

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
ToasterBiome pushed a commit that referenced this pull request Jul 17, 2022
@VaelophisNyx @Bibby0110
[Box] Total garden overhaul featuring FISHING (#14827)
08c782e 
* e (#14639)

* Adds fishing to the garden

BASS PRO SHOP SPACE STATION

* varedit works now hopefully

also less tools I guess.

* adds worse seed vendor for gardens

also makes the garden actually use it. Probably got the var edited nutrivendor right this time?

* fixes those tiles under those windows

also deletes the crate and scoots the tools over to that table

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

I am dead.

* and in my haste I forgot the dirt

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
ToasterBiome pushed a commit that referenced this pull request Aug 2, 2022
@VaelophisNyx @Bibby0110
Unreverts #14842, Adds new content to Gax, and fixes some stuff (#15094)
c6ee41f 
* e (#14639)

* Update GaxStation.dmm

* forgot the chapel and library doors

* reverts robotics change

look in the vendor folks

* e

sorry folks biome said I can't stop you from dying to pressure damage because a shitter broke the windows

* Update GaxStation.dmm

* oopsy the wall

toxins do be fucky

* forgot some more firelocks

man this station is really easy to fuck over with a plasma flood :/

* yet more firelock removals

* Update GaxStation.dmm

* Update GaxStation.dmm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
JamieD1 pushed a commit that referenced this pull request Aug 14, 2022
@TheRyeGuyWhoWillNowDie @Bibby0110
adds manatee's revolutionary AI lawset, which head revolutionaries ha…
4339816 
…ve the ability to upload. (#15115)

* e (#14639)

* Squashed commit of the following:

commit ad4e916
Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date:   Tue Jun 28 21:59:50 2022 +0200

    e (#14639)

* Update YogStation.dmm

* he he he

* law change requests

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
JamieD1 pushed a commit that referenced this pull request Aug 14, 2022
@TheRyeGuyWhoWillNowDie @Bibby0110
adds the Improvised Cryptographic Sequencer (#15141)
3ffaa68 
* e (#14639)

* Squashed commit of the following:

commit ad4e916
Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date:   Tue Jun 28 21:59:50 2022 +0200

    e (#14639)

* Update YogStation.dmm

* adds the Shitty Emag

* antispam plus suggestions

* Update cards_ids.dm

* quick fix

* animate ;)

* Orca sprites

* sussy merge conflicts

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
JamieD1 pushed a commit that referenced this pull request Aug 14, 2022
@TheRyeGuyWhoWillNowDie @Bibby0110 @tattax
fixes cyborg stun baton passive discharge (#15224)
bc5f45b 
* e (#14639)

* Squashed commit of the following:

commit ad4e916
Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date:   Tue Jun 28 21:59:50 2022 +0200

    e (#14639)

* Update YogStation.dmm

* Brogging

* Update code/game/objects/items/stunbaton.dm

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* poke turdis

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
JamieD1 pushed a commit that referenced this pull request Aug 20, 2022
@TheRyeGuyWhoWillNowDie @Bibby0110
No more making golem shells with atmos (#15295)
a0ca043 
* e (#14639)

* Squashed commit of the following:

commit ad4e916
Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date:   Tue Jun 28 21:59:50 2022 +0200

    e (#14639)

* Update YogStation.dmm

* Update mineral.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
JamieD1 pushed a commit that referenced this pull request Aug 20, 2022
@TheRyeGuyWhoWillNowDie @Bibby0110
adjusts the donksoft toy vendor's speaker messages (#15297)
6f18c1f 
* e (#14639)

* Squashed commit of the following:

commit ad4e916
Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date:   Tue Jun 28 21:59:50 2022 +0200

    e (#14639)

* Update YogStation.dmm

* Update toys.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Bibby0110 added a commit that referenced this pull request Sep 10, 2022
@VaelophisNyx @Bibby0110
Gives Revolution Heads Makeshift Weapons & Makes Emagging Borgs As Re…
2ef7c64 
…vs Give Them Revs Lawset & Rev Datum (#15603)

* e (#14639)

* creative use of floor

* Revert "creative use of floor"

This reverts commit 3ed4ce6.

* Update revolution.dm

* Update robot_defense.dm

* Update robot_defense.dm

* Update revolution.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Mapping Will result in a change to a map.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Bibby0110 @Yogbot-13