Commit Graph

955 Commits

Author SHA1 Message Date
SkyratBot
5afc46835b [MIRROR] Removes tablet cell parts [MDB IGNORE] (#17498)
* Removes tablet cell parts (#71078)

## About The Pull Request

Removes cell parts and cell part cells, now tablets directly stole a
power cell in them, and uses regular stock cells like every other
machine in the game. This also makes it less confusing because people
are more used to stock cells over computer cells. Because cells
generally hold more power than computer ones, I bumped up the active
power usage from 50 to 75.

## Why It's Good For The Game

We are nearly finished removing all parts, holy cr*p

## Changelog

🆑
balance: Tablets now use regular cells instead of computer cells.
balance: Tablets no longer need a power cell component to hold power
cells.
/🆑

* Removes tablet cell parts

* Feex

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-11-16 08:14:17 -08:00
Zonespace
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
SkyratBot
4b11bc848f [MIRROR] [MDB IGNORE] Clothing var cleanup [MDB IGNORE] (#17329)
* [MDB IGNORE] Clothing var cleanup

* modular changes except sec helmet

* SR maps

* Fixed sec helmet since it was custom toggling anyway, lots of misnamed icon states

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-09 16:53:06 -05:00
SkyratBot
9e9b09d90b [MIRROR] Chefs can now kiss food they make to make it with love. (And a lot of cooking refactoring) [MDB IGNORE] (#17334)
* Chefs can now kiss food they make to make it with love. (And a lot of cooking refactoring)

* update from master and fix conflicts

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-11-09 17:49:35 +00:00
SkyratBot
52448a80c7 [MIRROR] More flatbread recipies and a pizza for ethereals [MDB IGNORE] (#17362)
* More flatbread recipies and a pizza for ethereals (#70837)

## About The Pull Request

This PR adds in 6 new flatbread recipes that are a mixture of more
"traditional style" recipes that would have already existed and some new
ones that reflect the space station living lifestyle.

![dreamseeker_DNeiks8OgW](https://user-images.githubusercontent.com/116288367/198377608-c0f7a1d1-6d24-4fbc-9b89-ff2c528ace51.png)

Pictured from left to right is a bee larva and jellyfish flatbread
(stinging), raw meat flatbread (meatlovers), cucumber and egg with liver
flatbread (zmorgast, named after Smörgåstårta), fish and bbq sauce
flatbread (BBQ fish), tomato, mushroom, and oil flatbread (mushroom and
tomato), and korta nut flour and milk flatbread (nuffy).

It also features one additional pizza that can only be eaten by
Ethereals, because I think it is funny when Ethereals eat.

![dreamseeker_UU9Za4XLo8](https://user-images.githubusercontent.com/116288367/198377738-d2be39e1-b471-4967-a85c-bacc2f8aea0d.png)

It is made out of two batteries and flatdough.

## Why It's Good For The Game

Generally, this is to add more support as a cook who only makes pizzas
and flatbreads for the crew. As there are only three flatbreads. the
options for such a pizza focused chef who wants to feed any lizards is
pretty low, and then some of those require out of the way ingredients or
additional cooking. This offers a bit more variety to flatbreads
including some with overlapping ingredients to things that you might
already have your hands on if you want to go all in on Pizzacraft. The
ethereal pizza is just a bonus and so that all of the roundstart species
can have a slice now.

## Changelog

🆑
add: Added 6 new flatbreads and their associated recipes
add: Added 1 new pizza for ethereals
/🆑

* More flatbread recipies and a pizza for ethereals

Co-authored-by: Sol N <116288367+flowercuco@users.noreply.github.com>
2022-11-04 10:56:48 -07:00
SkyratBot
05fc476257 [MIRROR] Fixes the universal scanner's sprites and adds contextual screentips. [MDB IGNORE] (#17366)
* Fixes the universal scanner's sprites and adds contextual screentips. (#70926)

## About The Pull Request

This PR fixes a minor icon_state name discrepancy when switching to the
sales tagger mode (I forgot to add a space to the icon_state, which
carried over to the radial).

I then read #70909 which brings up several issues with the item, and
after actually testing it, everything works as intended. The issue it
appears is that it's not clear enough that the functionality is the same
as it was previously on the prior items, so we've added contextual
screentips to all 3 modes of the scanner.

![image](https://user-images.githubusercontent.com/41715314/198892524-65845906-736c-4859-87b2-304278b0c7a6.png)

## Why It's Good For The Game

Fixes #70909. Improves player feedback on the three modes of the
universal scanner through context.

## Changelog

🆑
fix: The universal scanner now properly show all three options in the
radial with sprites, due to a missing space.
qol: The universal scanner now has contextual screentips within all
three of its modes.
/🆑

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Fixes the universal scanner's sprites and adds contextual screentips.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2022-11-04 10:54:47 -07:00
SkyratBot
1261e956f1 [MIRROR] Adds a new black market item, the V8 Engine. [MDB IGNORE] (#17268)
* Adds a new black market item, the V8 Engine. (#70393)

This PR adds a new item to the black market uplink, the V8 Engine. The V8 engine is a classic, vintage engine, kept perserved for hundreds of years by black market smugglers, and they'll only ship it to you for an exceptional cost.

* Adds a new black market item, the V8 Engine.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2022-10-31 14:07:51 +00:00
SkyratBot
7502ddf9bb [MIRROR] Merges the Export Scanner, Sales Tagger, and Price Tagger into one item. [MDB IGNORE] (#17212)
* Merges the Export Scanner, Sales Tagger, and Price Tagger into one item.

* Update code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

Co-authored-by: coldud13 <coldud13@users.noreply.github.com>

* maps and crates

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: coldud13 <coldud13@users.noreply.github.com>
2022-10-28 22:11:01 -04:00
SkyratBot
097e913e4b [MIRROR] Removes tablet hard drives entirely (HDD & SSD) [MDB IGNORE] (#17164)
* Removes tablet hard drives entirely (HDD & SSD)

* map updates

* changes

* contractor uplink theme

* uplink improvements

* tab

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-26 14:09:16 -04:00
SkyratBot
9326e766a9 [MIRROR] Fixes the black market uplink path. [MDB IGNORE] (#17119)
* Fixes the black market uplink path. (#70707)

About The Pull Request

So, it turns out the crafting recipe for the black market was using obj/item/market_uplink to make black market uplinks. Now, as it stands, we only have one market, the black market. As a result, the parent pulls that as well.

However, that doesn't change the fact that the description for the parent is quite literally one of those "You shouldn't have one of these!" sorts of descriptions that we've usually try to report.

Why It's Good For The Game

Cleans up the item paths for future usage of the market system for potentially civilian markets and also makes it seem like the black market uplink actually works. (It does).

* Fixes the black market uplink path.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2022-10-23 15:03:25 -04:00
SkyratBot
612568daa0 [MIRROR] Swaps sleep() to use SECONDS define [MDB IGNORE] (#16973)
* Swaps sleep() to use SECONDS define

* merge conflicts and skyrat modules

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-19 19:43:24 -04:00
SkyratBot
4896d2281f [MIRROR] Adds back purchasing the Autorifle and ammo through emagging the cargo supply console [MDB IGNORE] (#16972)
* Adds back purchasing the Autorifle and ammo through emagging the cargo supply console

* Apply suggestions from code review

Co-authored-by: CCC23 <91553605+CCC23@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-10-19 21:14:36 +00:00
SkyratBot
634d9d8199 [MIRROR] Goodie lockbox contents can no longer go missing [MDB IGNORE] (#16928)
* Goodie lockbox contents can no longer go missing

* Update code/game/objects/items/storage/lockbox.dm

Co-authored-by: Profakos <profakos@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-10-17 18:57:07 +00:00
SkyratBot
3f9689a932 [MIRROR] Fixes ear bounty not clarifying it only accepts upgraded cybernetic ears. [MDB IGNORE] (#16863)
* Fixes ear bounty not clarifying it only accepts upgraded cybernetic ears. (#70499)

fix: Fixed ear bounty not clarifying that it only accepts upgraded cybernetic ears.

* Fixes ear bounty not clarifying it only accepts upgraded cybernetic ears.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-10-14 23:53:23 -04:00
SkyratBot
6b508466f0 [MIRROR] Made revisions to cargo bounty descriptions. [MDB IGNORE] (#16843)
* Made revisions to cargo bounty descriptions. (#70470)

Made numerous revisions to cargo bounty descriptions, and added one new bounty.

* Made revisions to cargo bounty descriptions.

Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com>
2022-10-13 17:38:04 -04:00
SkyratBot
6651687764 [MIRROR] Fixes some broken pathing for welding helmets [MDB IGNORE] (#16832)
* Fixes some broken pathing for welding helmets (#70466)

* Fixes some broken pathing for welding helmets

Co-authored-by: Rhials <Datguy33456@gmail.com>
2022-10-13 11:14:12 +01:00
SkyratBot
453f475328 [MIRROR] Cargo pack code reorganizing [MDB IGNORE] (#16798)
* Cargo pack code reorganizing

* Sync all skyrat changes

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-12 21:09:05 -04:00
SkyratBot
3795ed1a6b [MIRROR] [MDB Ignore]Hats DMI split [MDB IGNORE] (#16693)
* [MDB Ignore]Hats DMI split

* e

* STAFE

* e

* e

Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 23:00:42 +01:00
SkyratBot
e4d59278a0 [MIRROR] [MDB IGNORE] Shuttle engines part 2: Engines are now machines [MDB IGNORE] (#16676)
* [MDB IGNORE] Shuttle engines part 2: Engines are now machines (#69793)

* Makes engines machines instead of structures

* Updates the maps

* Fixes boards and anchoring

* Removes 2 unused engine types

Router was actually used a total of once, so I just replaced it with propulsion.
I think cutting down on these useless engine types that make no difference in-game would be a nice first step to adding more functionalities to them.

* Don't use power (since shuttles dont have)

Shuttles don't have APCs, instead they just have infinite power, so I'm removing their power usage for now. I'm hoping this can be removed when unique mechanics are added to engines, because I would like them to make use of power like other machines.

* re-organizes vars

* deletes deleted dm file

* Slightly improves cargo selling code

* Renames the updatepaths

* Removes in_wall engines

I hate this stupid engine it sucks it's useless it's used solely for the tram it provides nothing of benefit to the server
replaces them with regular engines

* [MDB IGNORE] Shuttle engines part 2: Engines are now machines

* should fix that

* THEY. REMOVED IN WALL ENGINES. THE BASTARDS.

* common mining shuttle

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 22:55:28 +01:00
SkyratBot
1ce3b0ab4a [MIRROR] 1 AM Leather Jackets [MDB IGNORE] (#16677)
* 1 AM Leather Jackets (#70284)

* yeah

* yea

* 1 AM Leather Jackets

* Update loadout_datum_suit.dm

Co-authored-by: axietheaxolotl <86872535+axietheaxolotl@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-09 22:38:37 +01:00
SkyratBot
30c887aac0 [MIRROR] New Knucklebones crate [MDB IGNORE] (#16675)
* New Knucklebones crate (#70211)

* Adds a new 'Knucklebone' crate to the Cargo console under Service's "Costume & Toys" section, which comes with a crayon, 19 dices, and a paper explaining how Knucklebone works.

* New Knucklebones crate

Co-authored-by: GrimsonGrime <90585674+GrimsonGrime@users.noreply.github.com>
2022-10-05 22:01:00 -07:00
SkyratBot
73ae6472a7 [MIRROR] NT Pay app. Money send on distance, transaction log! [MDB IGNORE] (#16672)
* NT Pay app. Money send on distance, transaction log! (#70108)

* base

* reasons

* GetToken proc, with a many remarks

* Add a way to change reason in transfer_money proc. Add a reasons.

* Reason to use the app. Commission. Standard application.

* Apply suggestions from code review - Tralezab

Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>

* Tralezab & jlsnow301 advices. New format(everywhere)

* Nanotrasen

* Refactor TGUI(not me:( ). Fix useless capitalize

* Update code/modules/economy/account.dm

* Trans transforms in transaction

* coMmission. little autodoc mistalke. Translation != Transaction

* oops

* Merge Conflict

* ...

* back feats

* mistakes bye!

* ну да

Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>

* NT Pay app. Money send on distance, transaction log!

Co-authored-by: Yaroslav Nurkov <78199449+AnywayFarus@users.noreply.github.com>
Co-authored-by: tralezab <40974010+tralezab@ users.noreply.github.com>
2022-10-05 19:38:36 -04:00
SkyratBot
d6f568bcc5 [MIRROR] Hotfixes Cucumber Bounty [MDB IGNORE] (#16647)
* Hotfixes Cucumber Bounty (#70285)

cucumber

* Hotfixes Cucumber Bounty

Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2022-10-04 11:44:02 -07:00
SkyratBot
9bf006d189 [MIRROR] Multiz Rework: Human Suffering Edition (Contains PLANE CUBE) [MDB IGNORE] (#16472)
* Multiz Rework: Human Suffering Edition (Contains PLANE CUBE)

* skyrat changes

* bodyparts merge

* unres door floorlight fix

* Future upstream fix for blindness

* upcoming upstream airlock fix

* fix button emissive

* Fix FOV markings?

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-02 23:30:09 -04:00
SkyratBot
1ce77983df [MIRROR] canUseTopic now uses TRUE/FALSE instead of defines that just say TRUE [MDB IGNORE] (#16586)
* canUseTopic now uses TRUE/FALSE instead of defines that just say TRUE

* etes

* eyes

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-10-02 15:54:46 +01:00
SkyratBot
3e7deb5d02 [MIRROR] Improves supplypack code to support repeats [MDB IGNORE] (#16585)
* Improves supplypack code to support repeats (#70210)

* changes how supplypacks are populated

was working on an not updated branch so might have some funny changes sprinkled in

* its 2022 time to update!!

* Improves supplypack code to support repeats

Co-authored-by: Aki Ito <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
2022-10-02 14:42:27 +01:00
SkyratBot
105216403f [MIRROR] Stops erroneous manifest prices decreasing exponentially to negative infinity [MDB IGNORE] (#16543)
* Stops erroneous manifest prices decreasing exponentially to negative infinity (#70165)

Fixes #69020 by applying k_elasticity = 0 to the negative priced items

* Stops erroneous manifest prices decreasing exponentially to negative infinity

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
2022-09-29 22:43:01 -07:00
SkyratBot
0339798a42 [MIRROR] Removes network cards and printers from tablets [MDB IGNORE] (#16451)
* Removes network cards and printers from tablets

* merge tablet_presets

* printer.dm should have been deleted, missed change

* update contractor tablet

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-09-27 23:16:32 -04:00
SkyratBot
d0b706c041 [MIRROR] Removes AI and Charge parts from tablets, adds support for more later. [MDB IGNORE] (#16381)
* Removes AI and Charge parts from tablets, adds support for more later.

* merge conflict

* remove modular tablet loadout item

* fix SR maps referencing tablets, add clear PDA instead of modular tablet loadout

* remove pda loadout item

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-09-27 17:52:24 -04:00
SkyratBot
8f033ead91 [MIRROR] Completely refactors hallucinations, and also adds a few [MDB IGNORE] (#16348)
* Completely refactors hallucinations, and also adds a few

* delete 5 old hallucination types that should have been removed

* Fixed old leftover tips conflicts

* Fixes all the leftover conflicts and otherwise broken code

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-09-25 19:43:45 -04:00
SkyratBot
249d97e387 [MIRROR] Adds fax machines to the supply shuttle blacklist [MDB IGNORE] (#16186)
* Adds fax machines to the supply shuttle blacklist (#69766)

Fax machines being present on the supply shuttle creates a risk that there may be ways to send other blacklisted items to CentCom in order to gain access. The neatest and safest solution to this broad realm of potential exploits is to keep the fax machine from being able to get there in the first place.

* Adds fax machines to the supply shuttle blacklist

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2022-09-12 21:08:45 -07:00
SkyratBot
7559990f20 [MIRROR] [MDB IGNORE] Shuttle engine code improvement and fixes [MDB IGNORE] (#16116)
* [MDB IGNORE] Shuttle engine code improvement and fixes

* what even happened in shuttlepanel.dm

* should be the last few

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com>
2022-09-10 18:28:57 -04:00
SkyratBot
bbadd8e831 [MIRROR] Cucumber Fever [MDB IGNORE] (#16034)
Cucumber Fever

Co-authored-by: Yaroslav Nurkov <78199449+AnywayFarus@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-09-05 18:09:54 -04:00
SkyratBot
a4bfe65cb1 [MIRROR] Dimensional Anomaly [MDB IGNORE] (#15974)
* Dimensional Anomaly (#69512)

About The Pull Request

Everyone has been asking: "When will there be an anomaly like the bioscrambler, but for the space station? Please, we need more things which replace objects with different objects from the same typepath."
Well I made it and it looked like ass because non-tiling floor and walls look terrible, so then I made this instead.
Dimensional.mp4

The "dimensional anomaly" shifts matter into a parallel dimension where objects are made out of something else.
Like the Bioscrambler anomaly, it does not expire on its own and only leaves when someone signals it or uses an anomaly remover.
When it spawns it picks a "theme" and converts terrain around it until it covers a 7x7 square, then it teleports somewhere else and picks a new theme.

A lot of these themes are relatively benign like "meat", "fancy carpet", or "gold". Some of them are kind of annoying like "icebox" because it creates floor which slows you down, or "clown" because bananium is intentionally annoying. Some of them are actively dangerous, mostly "uranium" and "plasma".
The main problem this will usually cause for crewmembers is decreasing area security. When it replaces doors it replaces them with ones which don't have any access control, and it will also replace RWalls with normal and much more vulnerable walls which will make breaking and entering significantly easier until someone has taken the time to fix the damage. But also sometimes it will irradiate them, you never know.

The fact that sometimes the changes are benign (or provide uncommon materials) and might be happening in places you don't care about access to might encourage people to push their luck and leave it alone until it starts turning the captain's office into a bamboo room or repainting medbay a fetching shade of flammable purple, which I would consider a success.
Armour.mp4

If you successfully harvest the anomaly core you can place it into the reactive armour to get Reactive Barricade Armour, which shifts your dimension when you take damage and attempts to place some randomised (not terribly durable) objects between you and hopefully your attacker (it really just picks up to four random unoccupied tiles next to you). If you're EMPed then the changes it make to the environment will often be as unpleasant for you as they are for a pursuer, and significantly more likely to harm both of you rather than just provide obstacles.

Other changes:
I split anomalies out into their own dmi file, seems to be all the rage lately.
I moved the anomaly placing code into a datum instead of the event because I wanted to reuse it but if you have a better idea about where I could have put it let me know.
This also fixes a bug where the material spreader component wasn't working when I applied plasma materials to something, the extra whitespace was parsing as another argument for some reason and meant it would runtime.
Supermatter delamination was still pointing to Delimber anomalies instead of Bioscrambler.

* Dimensional Anomaly

* Fixes the upstream merge skew

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-09-05 17:59:34 -04:00
SkyratBot
1e416342ea [MIRROR] [IDB IGNORE] Renames the inhand/misc folder to inhand/items [MDB IGNORE] (#15956)
* [IDB IGNORE] Renames the inhand/misc folder to inhand/items (#69573)

Also adds balloons to inhand/items

* [IDB IGNORE] Renames the inhand/misc folder to inhand/items

* update modular

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-09-04 15:29:47 +01:00
SkyratBot
3652337c49 [MIRROR] Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate [MDB IGNORE] (#15885)
* Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate (#68871)

Added a Star Trek Costume Crate and updated the Star Trek uniforms to modern sprite standards, as well as adding Voyager uniforms!

* Resprites Trekkie Uniforms, adds Voyager Uniforms, adds Trekkie Costume Crate

* goodbye

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-09-04 03:48:05 +01:00
SkyratBot
46b6b66273 [MIRROR] Fixes supply pods being vulnerable to explosions BEFORE they land. [MDB IGNORE] (#15978)
* Fixes supply pods being vulnerable to explosions BEFORE they land. (#69598)

An edge case that showed up during testing (spawning 5k supply pods.)

* Fixes supply pods being vulnerable to explosions BEFORE they land.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2022-09-01 18:02:47 -04:00
SkyratBot
35f2361a90 [MIRROR] The Ambrosia of the Corporate Masses: Coffeemakers [MDB IGNORE] (#15666)
* The Ambrosia of the Corporate Masses: Coffeemakers

* oops

* this is so me when i copy paste merge conflict markers

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-27 16:24:03 -04:00
SkyratBot
a8c10d1659 [MIRROR] Converts a shitload of istypes to their more concise macros [MDB IGNORE] (#15702)
Converts a shitload of istypes to their more concise macros

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-27 16:23:44 -04:00
SkyratBot
ba971e26a5 [MIRROR] Allows Brig Subtypes To Be Usable for Departmental Orders [MDB IGNORE] (#15794)
* Allows Brig Subtypes To Be Usable for Departmental Orders (#69411)

* Allows Brig Subtypes To Be Usable for Departmental Orders

Hey there,

I saw an odd thing on IceBox the other day, where they couldn't deliver the departmental order crate because they were trying to open it in `/area/station/security/brig/upper` and not `/area/station/security/brig`. When they went down a z-level and opened it in the correct area, it worked perfectly fine. However, I think it's a bit obtuse, and this sort of thing might only get worse as multi-z maps become more dominant. So, let's apply a code solution by making the areas list read off typesof for the department_delivery_areas for security crates.

* typesof didn't actually work, we go explicit now

* Allows Brig Subtypes To Be Usable for Departmental Orders

Co-authored-by: san7890 <the@san7890.com>
2022-08-25 14:51:49 +01:00
SkyratBot
9a237a7c23 [MIRROR] the express supply console now requires general cargo access instead of QM access [MDB IGNORE] (#15821)
* the express supply console now requires general cargo access instead of QM access (#69312)

* remove the access requirements

* cargo access  instead of qm access

* Update expressconsole.dm

* the express supply console now requires general cargo access instead of QM access

Co-authored-by: AIUNBOLT <111551669+AIUNBOLT@users.noreply.github.com>
2022-08-25 14:47:39 +01:00
SkyratBot
815644afb7 [MIRROR] adds sheep [MDB IGNORE] (#15826)
* adds sheep (#69318)

* adds funny sheep (need non-placeholder sprites still)

* indent this

* code suggestions

* components all the way down

* async

* sprites + reference

* think i did this right

* Update code/datums/components/mob_harvest.dm

Co-authored-by: san7890 <the@ san7890.com>

* steal shiz's suggestion pt1

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* steal's shiz's suggestion pt2

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* steal's shiz's suggestion pt3

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>

* adds sheep

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
Co-authored-by: san7890 <the@ san7890.com>
2022-08-25 14:45:43 +01:00
SkyratBot
88c85fe1f7 [MIRROR] [MDB IGNORE] Refactors drinks and fixes a lot of food problems [MDB IGNORE] (#15577)
* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* [MDB IGNORE] Refactors drinks and fixes a lot of food problems

* forgto 2 commit

* im slowly going insane

* why does find and replace not FIND everything

* hnghnnngh

* h

* l

* a

* a

* so close...

* delta fix

* I thought I committed this already, guess not

* this PR has been the bane of my fucking life

* orange juice

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>
2022-08-25 03:17:10 +01:00
SkyratBot
377bd33882 [MIRROR] Ports rideable pigs from Aether (With changes to make them basic mobs) [MDB IGNORE] (#15747)
* Ports rideable pigs from Aether (With changes to make them basic mobs) (#69248)

Adds rideable pigs from aether(With changes to make them basic mobs)
Pigs now drop pork, and you can cook it into pork chops.

* Ports rideable pigs from Aether (With changes to make them basic mobs)

Co-authored-by: LukasBeedellCodestuff <92578337+LukasBeedellCodestuff@users.noreply.github.com>
2022-08-24 18:40:02 -04:00
SkyratBot
57185bfcb2 [MIRROR] Fix certain orders not working on departmental supply consoles [MDB IGNORE] (#15567)
* Fix certain orders not working on departmental supply consoles (#69122)

regression or somethign

* Fix certain orders not working on departmental supply consoles

Co-authored-by: distributivgesetz <distributivgesetz93@gmail.com>
2022-08-12 14:39:50 -04:00
SkyratBot
1fc9ff9f79 [MIRROR] Fixes an oversight in food exports [MDB IGNORE] (#15541)
* Fixes an oversight in food exports (#69106)

* Fixes an oversight in food exports

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-11 06:36:00 -04:00
SkyratBot
6016cf97b4 [MIRROR] individual LOG_GAME [MDB IGNORE] (#15401)
* individual LOG_GAME

* e

* Update teleporter.dm

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-08-08 01:11:55 +01:00
SkyratBot
f0cef47678 [MIRROR] Adds the Mothroach [MDB IGNORE] (#15399)
* Adds the Mothroach (#68763)

About The Pull Request

Yup. That's pretty much it. This PR adds the Mothroach to the game, described as "An ancient ancestor of the moth that surprisingly looks like the crossbreed of a moth and a cockroach."

Do you love the Mothroach? Then you can cuddle with it and pat it, as well as place it on your head for extra cuteness.
What if you hate it, though? You can always kill and butcher Mothroaches in order to mass produce moth plushes for your own profit... How fun!

Either way, you win!

The Mothroach can be picked up and has a special on-head sprite (which looks really cute). It is able to vent-crawl and you may get one by randomly summoning a friendly mob through the gold slime extracts, or by ordering one through the Cargo Requests. After butchered, you may use its hide, a heart, and some cloth to craft a moth plushie, the most devilish of Devil's designs.

Full Preview of all the Sprites (NEW): https://www.youtube.com/watch?v=pdg8FTNEYjI
Preview of some of the Sprites (OLD): https://www.youtube.com/watch?v=9A-8hGCiW0s
In-hand, on-head, and grounded Mothroach sprite credits go to ValuedEmployee.
I did the Mothroach hide sprite though!
Why It's Good For The Game

The Mothroach is incredibly cute and a neat, fresh, new piece of content. Although it could use some future repurposing, right now it's simply a cute exotic pet with a few interactions.

These cute sprites are just too good to go to waste...

I keep seeing people complain about the lack of new content. Well, here's something niche that won't break the whole balance of the game and that will be cute. I seriously cannot see a motive not to add this to the game. Just because it isn't a powergaming tool or something that is seen every shift, that doesn't mean that it won't have a positive influence on the game. As I have stated, right now the Mothroaches are underperforming in terms of interactions and ways of getting them, but adding them is the first step to later improve them.
Changelog

cl
add: The Mothroach, your new local exotic pet
add: Mothroach Hide and Mothroach Meat
add: New crafting recipe for the Moth Plush: 1 Mothroach Hide; 1 heart; 3 cloth
fix: Fixes dead mobs on-head not having sprites
/cl

* Adds the Mothroach

Co-authored-by: Justice <42555530+Justice12354@users.noreply.github.com>
2022-08-05 01:03:04 +01:00
SkyratBot
b1bd40e760 [MIRROR] [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition> [MDB IGNORE] (#15362)
* [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition>

* Fixes merge conflicts and compilation errors, alongside fixing the joker card to make it fully functional again

* Fixed a bunch of info variables in map files

* Alright this is why I wanted this merged yesterday

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-04 15:50:15 +01:00
SkyratBot
c4d4511d39 [MIRROR] Lizards can now be bought from cargo [MDB IGNORE] (#15372)
* Lizards can now be bought from cargo (#68854)

* Lizards can now be bought from cargo

* Comma

* Lizards can now be bought from cargo

Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
2022-08-02 20:49:48 -07:00