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

Conversation

@yogstation13-bot
Copy link
Contributor

@AsV9 AsV9 merged commit bdd73b8 into master Mar 14, 2018
@Amelia0010 Amelia0010 deleted the upstream-merge-36406 branch March 16, 2018 11:51
fluffe9911 pushed a commit that referenced this pull request Aug 3, 2019
Amelia0010 pushed a commit that referenced this pull request Dec 3, 2019
Moltijoe added a commit that referenced this pull request Jul 1, 2024
…p-to-date! (#22235)

* hell

* import again faen (#10)

* we are so back

* yea

* 4.5/9

* Update IPC.dm

* 6/9

nice

* Update IPC.dm

* 7.5/9

* Fixes

* yes

* aight almost done here

* phytosians done

* yneos

* polysmorphs

* ps1

* plasmaman bugfix

* more stuff

* Update ethereal.dm

* f

* ETHEREALS DONE

* MOTHS DONE

* PLASMAMEN DONE

* HUMANS DONE

* VUULEN DONE

* POLYSMORPHS DONE

AAAAAAAAAAAAAAAAAAAA

* IPCS DONE

* reorganize stuff

* PRETERNIS HALFWAY DONE

* PRETERNIS ALMOST DONE

Xaction_coeff
implants - maglock, night vision
nohusk
lungs
virus

* Summary (required)

* yeah

* bricks the branch

* aight let's roll wit this

* Update yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm

thanks sapphic

Co-authored-by: SapphicOverload <93578146+SapphicOverload@users.noreply.github.com>

* preternis virus stuff doesn't exist anymore

* Update yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/species_types/IPC.dm

Co-authored-by: Molti <108117184+Moltijoe@users.noreply.github.com>

* stuff molti caught

thanks molti

* typos

---------

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants