Commit Graph

126 Commits

Author SHA1 Message Date
SkyratBot
d8a19cf7ae [MIRROR] Makes cargo orders and req forms easier to differentiate [MDB IGNORE] (#22227)
* Makes cargo orders and req forms easier to differentiate

* Update code/modules/shuttle/supply.dm

Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>

* removes one skyrat edit in favor of this

* Too much whitespace

---------

Co-authored-by: Nick <42454181+Momo8289@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
2023-07-12 06:38:10 +00:00
SkyratBot
7ffc0e786e [MIRROR] Cargo category cleanup [MDB IGNORE] (#21119)
* Cargo category cleanup (#75374)

## About The Pull Request

I accidentally discovered that when #55504 removed cargo export
categories being a thing during export value evaluation, in two
instances, they forgot to remove passing over the now defunct export
categories, causing it to be passed in as the elasticity value, and by
sheer coincidence, this was not causing problems (due to being overriden
by a named argument in the pirates case, and cargo_exports being
evaluated as true in another).

This PR fixes the arguments, preventing possible bugs in the future.
This also removes the code that set if the cargo shuttle could sell
contraband and emagged items, as that is no longer a thing. I talked
with @ ArcaneMusic about this, and they agreed, albeit with the caveat
that if someone finds a good use case for this feature, it could be
saved.

This PR also autodocs several export related files, and cleans up
various single and two letter vars.

## Why It's Good For The Game

Cleaner code, unused code removed.

## Changelog

🆑
code: cleaned up cargo export code a bit
/🆑

* Cargo category cleanup

---------

Co-authored-by: Profakos <profakos@gmail.com>
2023-05-14 16:02:52 -07:00
SkyratBot
7028b1d32e [MIRROR] Converts Spiderlings from Structures to Basic Mobs [MDB IGNORE] (#20852)
* Converts Spiderlings from Structures to Basic Mobs (#75001)

If I could've made this more atomic, I would have in a heartbeat, trust
me.

## About The Pull Request

Hey there. People were mocking us for having spiderlings still be a
subtype of `/obj/structure`. I decided to take a lot of time to fix
that. A lot of behavior it was implementing was just pseudo-mob stuff,
so it was actually easier than it looked for the raw conversion. A lot
of the footwork on spider stuff in the basic framework was already done
previously by Jacquerel, so that was pretty nice.

However, there are two new things that weren't introduced in the code
that had to be put in.

A) A component to handle growth and differentiation into a mob. This may
have already existed, no clue. If it does (and it's NOT
evolutionary_leap), let me know.
B) AI Behavior to handle seeking out a vent, entering a vent, and then
exiting out of a different vent. I may have gone a bit wacky on the
code, but it certainly works as expected (spiderling goes in one vent,
exits the other). Let me know if you can think of a way it can be better
optimized, but it was deliberately written to be very failsafey in case
shit goes yonkers.

One fundamental difference between structure spiderlings and basic mob
spiderlings (beyond the AI and not just a random prob() check for
movement) is the fact that they had vent movement coded in... but we
_really_ don't need stuff like that for our intents and purposes. If the
range turns out to be too OP in the current framework, we can always
change it up a bit, but also there's a _lot_ of vents we can end up in
the station (my testing had one spiderling end up in the AI sat to get
obliterated).
## Why It's Good For The Game

Spiderlings aren't structures! They behave like a mob should! Players
can possess spiderlings! They work seamlessly with differentiating into
a giant spider! Better AI! More room for people to add into this very
under-utilized buggers!
## Changelog
🆑
refactor: Spiderlings are now basic mobs, report any complete
weirdness/deviation from known behavior. They should be a lot more
intelligent now though.
add: AI Spiderlings are super fragile, but they're also super fast,
especially when they get into a vent. Once they're in circulation, they
could end up everywhere! Maybe in the armory, maybe in a locked closet
in maintenance. Be sure to be vigilant and splat them whenever you can
to save the station from a whole lotta heartache!
/🆑

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* Converts Spiderlings from Structures to Basic Mobs

---------

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
2023-04-30 12:54:58 -07:00
SkyratBot
d184bcec4a [MIRROR] Minor improvements to mining order console [MDB IGNORE] (#18467)
* Minor improvements to mining order console

* merge

* Mining orders can no longer error and don't say they charge you (#71676)

- Mining orders now show the amount of mining points spent as the 'Cost'
instead of a flat 240 credits

- Mining orders now no longer have errors (including nothing being in
the crate at all) because they can't be sent back for a full refund.

- Mining orders no longer say they charged you if they haven't.

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
2023-01-12 13:40:14 -05:00
StrangeWeirdKitten
93373deded [Kinda A Priority] Fixes Free Cargo. (#18353)
* nice

* Can we all agree cargo should be removed

* My brain is too small for operators

* should move this down
2022-12-27 13:22:10 -08:00
Paxilmaniac
123b7d15f3 Actually for real de-cocks the cargo shuttles (#17786 alternative) (#17803)
* now time for the durability test

* chief, get inside, gear up
2022-12-21 13:18:57 -05:00
SkyratBot
6f2ea4f81c [MIRROR] Investigate logs include ckey of source (if applicable) [MDB IGNORE] (#18066)
* Investigate logs include ckey of source (if applicable)

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

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

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-12-15 10:38:47 -05:00
SkyratBot
6756631e75 [MIRROR] The Mining vendor now works like the Chef produce console (has to go through Cargo) [MDB IGNORE] (#17852) 2022-12-01 14:34:56 -08:00
Paxilmaniac
683601cd9f Gun Cargo Rework: Now with 90% less gun and 100% more stuff the rest of the crew can actually use (#17326)
* quick reorder

* nakamura part 1

* nakamura finished maybe

* blacksteel does not actually make black steel

* renames the folder, special metals part 2 for blacksteel

* WHERE WE PLAY NOTHING BUT ROCK, ROCK, AND MORE ROCK

* file pathing

* blacksteel done

* nri surplus start

* interest stuff, company flags, nri surplus completion

* deforest medical

* theres gonna be multiple nakamuras actually

* donk co

* the prices are behaving strange

* those are a tad expensive

* im so confused

* ticks the other companies to see if maybe they're responsible

* also maybe that?

* on jod bro they just needed to all be the same name

* kahraman mining tools

* nakamura tools

* nt-bolt defense equipment

* the two g*n companies

* ammo company

* good lord what is happening in there

* STOP TALKING ABOUT GUNS, IM TIRED OF HEARING ABOUT IT

* hopefully the last few bits of gun-centricity (i don think that's a word

* price adjustment

* changes what can be a freebie

* those should be the other way around

* well that'd just make the descriptions incorrect now would it

* 1st batch of changes

* pt2

* oopsies (makes every test fail)

* then king minos told me "DIE" and I was like 💀

* some of those things could cause problems

* they even spelled asbestos wrong

* ultrakrill (funny)

* i hate this dumbass """"""advanced"""""" ammo box thing

* nakamura was a bit hard to get interest from

* not much a fan of how interest goes down

* those mod cores should be cheaper

* again fuck this stupid ''''''''advanced'''''''' ammo box shit

* price adjustment

* misinput

* Update accretion_incompatibility.dm

Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-11-24 02:25:17 +00:00
SkyratBot
a64129ab27 [MIRROR] [MDB Ignore] Corrects Automatic Shuttle Boundary Generation [MDB IGNORE] (#17489)
* [MDB Ignore] Corrects Automatic Shuttle Boundary Generation (#71220)

When you load a map template, it does many things before considering
itself finalized.
One of these steps is to iterate over all the loaded items and
initialize/process them.
Unfortunately because a shuttle setups the bounds after
initTemplateBounds is called, the mobile docking port ends up being
initialized before the bounds are actually setup correctly.
The solution to this is to explicitly ignore the mobile docking port,
and have it initialize immediately after calculating the bounds.

* [MDB Ignore] Corrects Automatic Shuttle Boundary Generation

* arrivals shuttle

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-11-16 14:28:54 -05:00
SkyratBot
0c6a40910d [MIRROR] Save 0.4s by shaving off a lot of smaller init costs [MDB IGNORE] (#17382)
* Save 0.4s by shaving off a lot of smaller init costs

* update modular

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-11-09 14:52:58 +00: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
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
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
e914af568f [MIRROR] Revert "Add stamped requisition forms now give bonus credits (#66230)" [MDB IGNORE] (#13497)
* Revert "Add stamped requisition forms now give bonus credits (#66230)" (#66851)

This reverts commit f021767645.

This reverts commit f021767 from:

    Add stamped requisition forms now give bonus credits #66230

This bug was encountered when we were testing this PR but I thought it got fixed.
Why It's Good For The Game

Cargo crates will now reappear.

* Revert "Add stamped requisition forms now give bonus credits (#66230)"

Co-authored-by: Tim <timothymtorres@gmail.com>
2022-05-09 21:47:24 -07:00
SkyratBot
2f80179873 [MIRROR] Add stamped requisition forms now give bonus credits [MDB IGNORE] (#13446)
* Add stamped requisition forms now give bonus credits

* Update packs.dm

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-09 01:26:00 +01:00
Zonespace
874fa41650 Fixes briefcase departmental order access for guncargo (#13148)
* finally

* comment

* fix to another bug
2022-04-27 20:51:28 +01:00
SkyratBot
b501ff54ea [MIRROR] Adds the Accounting Console to the game (HOP Job Content) [MDB IGNORE] (#13119)
* Adds the Accounting Console to the game (HOP Job Content)

* Update economy.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-04-26 15:27:04 +01:00
Zonespace
4c6d7911fb fuck (#13112) 2022-04-26 01:39:33 +01:00
Zonespace
285c44fae4 weh (#13051) 2022-04-24 14:01:47 +01:00
Zonespace
349a3325ec Adds Gun Cargo (#12632)
* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
2022-04-23 17:34:08 +01:00
SkyratBot
a6a4451cad [MIRROR] Removes a repeated entry of hilberts hotel from the blacklisted_cargo_types list [MDB IGNORE] (#11782)
* Removes a repeated entry of hilberts hotel from the blacklisted_cargo_types list (#65171)

* Removes a repeated entry of hilberts hotel from the blacklisted_cargo_types list

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
2022-02-28 12:11:40 -05:00
SkyratBot
61ca3472ea [MIRROR] PURE Code Improvements to the Shuttle Subsystem [MDB IGNORE] (#10609)
* PURE Code Improvements to the Shuttle Subsystem

* modular updates

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-01-12 02:47:57 +00:00
OrionTheFox
67e7ebdfaa [Semi-Modular] Advanced Shuttles Revamp, and new Advanced Shuttles! (#9951)
* clean up closets

* add new closets back

* it didnt use dir lights!?!?!

* bye bye

* name can be shorter reee

* com press

* HERE THEY COMEEEEE

* largemine/labor

* consign my love

* h

* tweakingsies

* better miining

* these look nice

* oops

* fix the evac shuttle tiles a bit (i still hate it)

* hngh

* i coulda sworn..

* exodus

* apostraphe

* area

* name

* clozet

* color consistency

* backwards ship moment

* fix my oops with the vents

SUS??

* this is cleaner

* typo moment

* note

* note, no-sell in cockpit, wall lockers

* jsons for crago

* oh hey thats broken cool

* map moment

* totally unrelated fix that I just wanna do here bc no one remembers it

* this doesnt actually work. Yet.

* ferry and readme fixes

* this doesnt work and I cant be bothered to fix it this second. Dunno how

* double period moment

* dir was wrong, oops

* map conversion moment

* CI fail moment

* h

* pain
2021-12-13 11:08:42 +00:00
SkyratBot
8bc5abff25 [MIRROR] Fixes a few cargo exports problems. [MDB IGNORE] (#9531)
* Fixes a few cargo exports problems. (#62686)

About The Pull Request

Cargo exports will now start deleting the thing and its contents only after everything has been sold and hopefully stop objects from being deleted before getting sold (no export datum actually deletes anything on sell_object()). This PR also removes a variable only used in one place (an admin only item created by ExcessiveUseOfCobblestone, who probably didn't know there's an argument that stops unsold items from getting deleted) and that may be source of harddels.
Why It's Good For The Game

This will fix #62644, perhaps some harddels and other oddities.
Changelog

cl
fix: Cargo exports will now start deleting items only after everything is sold. This will fix issues such as unachievable exports (like machine ones) and getting less credits than what export scanners says.
/cl

* Fixes a few cargo exports problems.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-11-18 01:16:46 +00:00
SkyratBot
270a8253bf [MIRROR] Routine Cargo Departmental Deliveries [MDB IGNORE] (#9405)
* Routine Cargo Departmental Deliveries (#61992)

About The Pull Request

Document: https://hackmd.io/@ bazelart/HkY-SO9VF

Each department's request console is upgraded. Instead of making requests, they are only able to see crates related to their department that helps the department. They can order one for free (so not out of anyone's wallet) and it will arrive at cargo. Cargo gets the price of the ordered crate for bringing it to the department that ordered it (via an area check, of which the crate will remain locked until satisfied, emitter cracking aside).

Ordering a crate puts the console on a cooldown depending on the price of the crate ordered. The time ranges from 10 minutes at the lowest value, to capped at 20 minutes at 4x the default crate's price. the price in time follows a ease in out circular function, where the time increases slowly as the time goes up, but a lot in the middle. towards the higher end it slows down again.

Cargo will start with far less money, but this is countered by the new source of income.

Finish Mapping it
Finish tgui panel for department orders
Testmerge it for balance and feedback who cares

    Maybe give multiple destination areas, just in case one area gets obliterated who cares!

Why It's Good For The Game

Cargo starts with a budget to spend on themselves, which lets them order their department rewards before doing anything. There is no inherent reward to delivering to other departments other than social expectations of filling the job, which means cargo will simply ignore deliveries and requests if there are more self-important things going on, since those deliveries both cost cargo and do not help cargo in any way
Changelog

cl
add: replaced the request consoles in each department with department order consoles, which order for free on a cooldown. cargo gets these orders and delivers the crates, which are locked until delivery. upon delivery, cargo gets paid the value of the crate, and can then sell the crate back on the shuttle.
balance: cargo doesn't start with a budget, other departments get what their budget was split up amongst them
/cl

* Routine Cargo Departmental Deliveries

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-14 12:04:29 -05:00
SkyratBot
cc93b11d23 [MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-06 22:07:01 +01:00
Gandalf
8fe50110dc Reverts NTF roles and the NTF Cargo system pending OVERMAP. (#8342)
* EEEE

* Update CentCom_skyrat_z2.dmm
2021-09-23 01:17:59 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
Gandalf
356e7b182e Removes bluespace lockers (#7412)
* fuck off

* Update CentCom_skyrat_z2.dmm

* THOT BEGONE
2021-08-05 23:47:08 +01:00
SkyratBot
031237f2d1 [MIRROR] Fixes cargo manifest exports. (#7265)
* Fixes cargo manifest exports. (#60538)

* Fixes cargo manifest exports.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-08-01 11:40:37 +01:00
SkyratBot
b37a7f134e [MIRROR] Refactors mail, delivery and goodies code (#6432)
* Refactors mail and delivery code (#59730)

- Mail now uses weakreferences to minds, which means the presence of
  mail will not cause harddels, and persist between mindswaps or cloning
  or whatever horrible mob transfer things you've got going on.
- The code for creating a crate of mail has been refactored into a
  single proc, rather than having the same code twice.
- Instead of special casing reagents being delivered, instead
  reagent mail goodies are just regular bottle items like any other.

* Refactors mail, delivery and goodies code

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-06-22 00:48:42 +01:00
SkyratBot
0d47e63221 [MIRROR] Mail holidays. (#5554)
* Mail holidays. (#58728)

* Mail holidays.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2021-05-08 13:44:11 +01:00
SkyratBot
6eb42f889d [MIRROR] Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients. (#5232)
* mail fixes 😎 (#58716)

now mail doesn't get sent to... BAD recipients. (Antags arm, just say antags)
fixes incorrect unwrapping message (bad usage of a visible message)
mail recipients wasn't shuffling either. I'm fairly certain this was leading to some people always getting mail and some never getting it.

* Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients.

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-27 00:01:18 +01:00
SkyratBot
4b7a149fb9 [MIRROR] Fixes mail multiplying in a hellish race to Avogadro's number (#5175)
* Fixes mail multiplying in a hellish race to Avogadro's number

* Update supply.dm

* Update supply.dm

* Update supply.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:41:33 +01:00
SkyratBot
c418b139be [MIRROR] Ports Mail From Kiwi Take 2: Arconomy Class Mail (#5172)
* Ports Mail From Kiwi Take 2: Arconomy Class Mail

* Update wardrobes.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:20 +01:00
SkyratBot
574ce13181 [MIRROR] [s] Restores Cargo Shuttle Blacklist Enforcement (#4731)
* [s] Restores Cargo Shuttle Blacklist Enforcement (#58201)

Removed an inappropriate as anything inside the cargo shuttle's blacklist check that was breaking it.

* [s] Restores Cargo Shuttle Blacklist Enforcement

Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-04-08 03:06:21 +01:00
SkyratBot
b261424aaa [MIRROR] Fixes a minor oversight with eigenstasium (#4587)
* Fixes a minor oversight with eigenstasium (#58069)

* Fixes a minor oversight with eigenstasium

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
2021-04-02 01:35:55 +01:00
SkyratBot
c765afc23d [MIRROR] Chef Produce Console, for cases where there are no botanists (#3786)
* Chef Produce Console, for cases where there are no botanists (#57298)

* Chef Produce Console, for cases where there are no botanists

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-03 03:42:00 +00:00
NotRanged
f4623e0a2d [Modular] Ports the bluespace locker from oldskyrat (#2962)
* everything but da map

* everything but da map

* Makes it work ~somehow~, I have genuinely no clue why 

Stumbled upon the fix by pure luck

* Trailing newline

* . = ..()

* what the fuck?

* this works

* mapping is pain

* why tf is the CI failing, run it again

* hhh

* wack

* Resolves map conflict

* a

* Actually solves the conflict now

* please

* Webedit spacebar to rerun CI

* i swear to fucking god

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* id console -> modular console

* Rerun CI

* deletes the fucking map

* fixes the merge conflict AGAIN

Co-authored-by: Ranged <nickvanderkroon@gmail.com>
2021-02-18 19:23:22 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
SkyratBot
6355c9917e [MIRROR] Export scanner doesn't need to link + old bounty code is gone (#2197)
* Export scanner doesn't need to link + old bounty code is gone (#55504)

Removes the Export scanner's need to link with a console and cleans up the old bounty code

* Export scanner doesn't need to link + old bounty code is gone

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
2020-12-17 08:02:12 +01:00
SkyratBot
f105b47a55 [MIRROR] Singularity component (#2082)
* Singularity component (#55096)

Adds singularity component

* Singularity component

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-12-08 11:30:39 +00:00
SkyratBot
c4e85d51ae [MIRROR] Completely FIX Hilbert's Hotel and its associated ruin to the game. (#1111)
* Completely FIX Hilbert's Hotel and its associated ruin to the game. (#53830)

Reverts the removal in #53790.
Broken in #53586.

Because turfNumber++ must be incremented on turf, not on every ATOM it
EVERY TURF, and anyway it don't trigger since first turfs don't have
atoms in it.

Fix #53794, Hilbert's Hotel peephole runtime.
Fix #53795, hhmysteryRoomNumber generates only once.

* Completely FIX Hilbert's Hotel and its associated ruin to the game.

Co-authored-by: Dennok <Deneles@yandex.ru>
2020-10-02 14:56:57 +02:00
SkyratBot
3eb4b68b60 [MIRROR] Completely removes Hilbert's Hotel and its associated ruin from the game. (#881)
* Completely removes Hilbert's Hotel and its associated ruin from the game. (#53790)

The Hotel is a runtime machine. When it swaps rooms, its turfs runtime. When people are actively using it, things in it constantly runtime. It's half broken, half buggy. Turfs don't remember contents. Sometimes blank rooms spawn. Sometimes nothing at all.

It's not worth the time and effort to fix or maintain it.

I'm opening this PR to completely remove it.

* Completely removes Hilbert's Hotel and its associated ruin from the game.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2020-09-20 00:36:15 +01:00
SkyratBot
cd0d700a85 [MIRROR] Mecha refactor 2020 (#579)
* Mecha refactor 2020

* Update effects.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-09-02 02:16:51 +02:00
SkyratBot
284f2de8a1 [MIRROR] Cleans up some unused procs and makes is_blocked_turf a turf proc. (#136)
* Cleans up some unused procs and makes is_blocked_turf a turf proc. (#52482)

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

* Update code/game/turfs/turf.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>

* Cleans up some unused procs and makes is_blocked_turf a turf proc.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-31 00:30:27 +02:00
Ryll Ryll
202120e5a1 Limits free shipping on goody orders in cargo (#51587)
* goody goody

* pleases travis

* moves preexisting line
2020-06-19 10:46:13 +12:00
Ryll Ryll
afdce632bc Adds coupons to cargo, turns small crates into goodies (#51216)
* Adds coupons

* fixes invalid var

* fixes old var name

* test

* does this please you travis?

* is that a prize, or....

* adjusts odds

* fikou owes me $10

* neatens code per review

* corrects bouncy

* corrects some errors

* redisables price gouging on goodies
2020-06-03 21:40:39 +02:00