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

Conversation

@Bibby0110
Copy link
Contributor

Document the changes in your pull request

Wiki Documentation

Changelog

ynot01 and others added 30 commits June 14, 2022 18:33
…r. (#14416)

* Adds a warning

* punctuations exist apparently

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
…nd not spawn on lavaland corpses (#14435)

* does sa thing that makes probably the miner gpses spawn with numbers and not spawn on lavaland corpses

* Update shaft_miner.dm

* Update shaft_miner.dm

* no more double mining medic gps
… missing spaces (#14406)

* Adds a new 3x3 maint ruin

Adds a new 3x3 maint ruin consisting of 4 vendors, some minor loot, and deco.

* renamed ruin

Renamed ruin for clarity

* add new maint ruin to station.dm

fixes maint ruin not being listed, because I didn't know

* update entire stations.dm file

who forgot the spaces lmao

* update station.dm to include author credit for new ruin

* corrected author credit

changed to ckey from github username

* update map file

* update map file again

why did it not save the credit chip change???

* added light to left side of ruin
Yogbot-13 and others added 14 commits June 26, 2022 10:15
* spritesheets port

Ports sprite sheets to also have support for multiple/modular clothing files, which I will probably also port.

* pain

* fix

* fix

* Revert "fix"

This reverts commit 5e11310.

* Revert sprite sheet stuff

* fixed the revert

* merge fix

* checks

* checks x2

* fixes some belts

* initial fixes

* a

* accessories

* a

* robo labcoat fix
* Fixes whale spawning

* Forgot to add bugfixes

* Adds map change (maybe)
* Makes the hand drill pointy

* Blunt Wrench
* Fixes

* Map

* Emag

* I dont know how to code

* Glass

* Update code/modules/research/rdconsole.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Fixes shitty code

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
@Bibby0110 Bibby0110 requested a review from a team as a code owner June 28, 2022 19:44
@Yogbot-13 Yogbot-13 added the Mapping Will result in a change to a map. label Jun 28, 2022
@ToasterBiome
Copy link
Contributor

Pictures please

@Bibby0110
Copy link
Contributor Author

Pictures please

nope

@JamieD1
Copy link
Contributor

JamieD1 commented Jun 28, 2022

image

@ToasterBiome
Copy link
Contributor

image

Looks good

@Bibby0110 Bibby0110 changed the title Makes it harder for the HoS to break into Box RnD, without adding 2 ugly airlocks Makes it harder for the HoS to break into Box RnD, without adding 2 ugly airlocks (by adding indestructible walls) Jun 28, 2022
@Bibby0110 Bibby0110 changed the base branch from master to mastr June 28, 2022 19:54
@Bibby0110 Bibby0110 requested review from a team as code owners June 28, 2022 19:54
@Bibby0110 Bibby0110 merged commit 7cd3ed8 into mastr Jun 28, 2022
@Bibby0110 Bibby0110 deleted the fdmm-patch-82403563-TheGamerdk branch June 28, 2022 19:54
@Spacemanspark
Copy link

you madman

@Bibby0110 Bibby0110 restored the fdmm-patch-82403563-TheGamerdk branch June 28, 2022 19:59
@Bibby0110 Bibby0110 deleted the fdmm-patch-82403563-TheGamerdk branch June 28, 2022 19:59
@Marmio64
Copy link
Contributor

how will mastr ever recover from this...

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

Labels

Mapping Will result in a change to a map.

Projects

None yet

Development

Successfully merging this pull request may close these issues.