From 9db2ed4a05671042a80a2efc25791c172d28970c Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 10 Jul 2023 23:51:39 -0400 Subject: [PATCH 1/3] rules and a few vending and event and ui tweaks --- .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs | 2 +- .../VendingMachines/Inventories/sec.yml | 24 ++-- Resources/Prototypes/GameRules/events.yml | 2 +- Resources/ServerInfo/Rules.txt | 108 ++++++++++-------- 4 files changed, 76 insertions(+), 60 deletions(-) diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs index 6f77b3536fe..835319fc353 100644 --- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs +++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs @@ -95,7 +95,7 @@ public void PopulateProducts(ShipyardConsoleUiKey uiKey) { Vessel = prototype, VesselName = { Text = prototype.Name }, - Purchase = { ToolTip = prototype.Description }, + Purchase = { ToolTip = prototype.Description, TooltipDelay = 0.2f }, Price = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Price.ToString())) }, }; vesselEntry.Purchase.OnPressed += (args) => { OnOrderApproved?.Invoke(args); }; diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index a02da49f40c..9c2941c8e49 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -1,18 +1,20 @@ - type: vendingMachineInventory id: SecTechInventory startingInventory: - Handcuffs: 8 - GrenadeFlashBang: 4 - Flash: 5 - FlashlightSeclite: 5 - ClothingEyesGlassesSunglasses: 2 - ClothingBeltSecurityWebbing: 5 - Zipties: 12 - RiotShield: 2 - RiotLaserShield: 2 - RiotBulletShield: 2 + Handcuffs: 12 + GrenadeFlashBang: 14 + Flash: 15 + FlashlightSeclite: 15 + ClothingEyesGlassesSunglasses: 12 + ClothingBeltSecurityWebbing: 15 + Zipties: 20 + RiotShield: 12 + RiotLaserShield: 12 + RiotBulletShield: 12 + Stunbaton: 10 + WeaponDisabler: 10 # security officers need to follow a diet regimen! contrabandInventory: FoodDonutHomer: 12 - FoodBoxDonut: 2 + FoodBoxDonut: 12 #box evidence diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 784555f563d..9850107d013 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -5,7 +5,7 @@ components: - type: StationEvent weight: 10 - minimumPlayers: 45 + minimumPlayers: 110 startDelay: 30 duration: 35 - type: AnomalySpawnRule diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt index f4d8691afe1..6e6620a08c0 100644 --- a/Resources/ServerInfo/Rules.txt +++ b/Resources/ServerInfo/Rules.txt @@ -2,17 +2,71 @@ [color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color] +[color=#00c000]STATION RULES[/color] + +These rules are non-negotiable and will result in administrative action up to and including appeal only bans if violated. These rules are in place to ensure a healthy learning environment for players who are new to the mode or who are even just looking for a sigh of relief and some peace time. + +The main Frontier Outpost station is to be treated similar to arrivals. It is a safe zone, where no antagonist activities are permitted period. This includes but is not limited to: destruction, modification, removal, or otherwise restriction of use any machine or device designed for the public use, and the structure of the station itself. For any non-antagonistic or 'RP' modifications of the station, HoP's approval is required always. + +Time spent docked and waiting at the station is to be kept at a minimum. Station administration (HoP or HoS) is allowed to levy fines or otherwise evict shuttles that have been idle for more than 10 minutes in the station docks without a valid reason. Station staff may NOT rent out these docks or otherwise directly profit from the reservation of the docks (i.e., docking fees for initial usage) as these are still needed for brief visits to atms and taxi shuttles to the station, and for free and general public use. + +Any and all players that are hired on as crew to the station, either through HoP or HoS, as Security or Service Staff or through other direct jobs working for paychecks, are considered Non-Antags and official NT representative employees and any hostile antagonist actions performed by them while currently employed in these jobs can result in administrative action. + +Security forces, whether hired on by HoS, HoP, or joining as role on a ship, are also strictly non-antag and engaging in any hostile antagonistic activities, or the abuse of the equipment provided you while working in these roles, WILL result in administrative action. You are bound to enforce Space Law to insure the safety of the citizens in the sector. You are still bound by traditional escalation rules and must always attempt to use non-lethal force whenever possible. + +Jail sentences and punishments still apply just like on your average station. Pirates are not simply punishable by murder and abandonment. Suspects, Criminals, and Pirates must all be processed and recieve punishment, justice, and fair treatment according to traditional Space Law. Jail sentences can be carried out only on station or on official security shuttles. Due to limited space within station jail facilities, NT has approved limited bail release in lieu of jail time, in the amount of 2000 X the jail term. 2 minutes in jail = 4,000 fine, 10 minutes = 20,000 fine. Verified victims of property theft or damage or other financial crimes are to be made whole using the assets of the guilty party seized by any security forces or bounty hunters or otherwise(NOT BANK ACCOUNTS). + +Bounties are not limited to official hired security forces. Groups of civilians are permitted to use appropriate methods to capture and claim the reward for any security bounty placed upon any suspect. The bounty's terms will dictate the required condition of the suspect upon delivery. Hostile forces that are known, declared, and confirmed, may be considered 'belligerent' and boarded non-conventionally and have their systems disabled in attempts to bring justice. All suspects taken alive must be properly cared for and unharmed according to Maritime Law. + + +[color=#00c000]HoP and HoS[/color] + +Head of Personnel and Head of Security (soon to be renamed) are strictly Station Personnel and their jobs are to ensure the safety and security and well being of all law abiding citizens of the sector. They both have access to the Station Funds, which increases with the success of the station itself. Both of these roles are permitted to act on behalf of the other in their respective duties, should any staffing issues arise. + +These roles are vital to keep the station itself running smoothly, and so there may be times where multiple positions are available for them on the station. This is only until we have a more sane way of handling job positions/openings, where a HoP or a HoS can open a job slot up in the station before heading into cryo. + +Both of these roles have higher access to station resources than should be allowed for most crew members. As such, if you must ever end your shift early ALWAYS bring your ID with you, and ALWAYS return to cryosleep so that your access cannot be stolen and the station funds embezzled. If for any reason you cannot (disconnect, crash, power outage, etc.) Please ping the game admins in discord and we will handle your in-game character accordingly. + +Failure to follow these rules or strict RP standards may be subject to roleban/de-whitelisting. + +[color=#00c000]HoP[/color] + +Head of Personnel is in charge of paying civilian staff to perform functions to keep the station running smoothly for all guests. These duties may include, but are not limited to: Janitorial duties, Mail sorting and delivery, Docking/Valet services, keeping auxillary station services functional (turning on distro, setting up the cloner). + +You may not tax, lease, rent, or otherwise reserve the free and fair usage of station resources to the detriment of the public. That includes but not limited to, charging docking fees (fines for overstaying and forced evictions however are encouraged), charging for basic cloning services, charging for vending access, moving station resources behind access locked doors to restrict access, etc. + +You are also permitted and expected to issue and enforce any docking fines related to loitering in the terminal, up to and including forced eviction of shuttles. Fines collected in this way are permitted to be used as payroll or the acquisition of station supplies. You are also permitted to issue and pay bounties to bounty hunters/security forces if a HoS is not around or is busy. + +Shifts are expected to run for 6 hours currently. You are not required to stay for the entire shift. Calling for the emergency shuttle before the 4 hour mark should always be AHELPed first. Citizens in the sector also are much happier when they have at least a 15 minute warning before the shuttle is called. + +The HoP should always remain on or in the very near vacinity to the station, and is one of the only roles with such a restriction. Station funds may be used to pay yourself a paycheck as well, but it must be a reasonable amount comparable to what other station employees are being paid. All bank transactions are logged. + +The Head of Personnel is a very busy role, and there may at times require multiple people to assist in many tasks. Often the role will have several positions available so that you may leave the shift early or take a break and switch roles. ALWAYS take your ID with you into cryo-sleep and ALWAYS use cryo-sleep to end your shift. + +[color=#00c000]HoS[/color] + +Head of Security is in charge of keeping the sector free of piracy and general criminality. We will be enforcing Space Law as found here: https://wiki.nyanotrasen.moe/view/Space_Law as best interpreted for the Frontier. This includes ensuring the safety and well being of all prisoners and suspects, the fair treatment of all players, along with sentencing guidelines and procedures. + +They are permitted to issue bounties for the capture of known hostile forces in the sector. The terms of capture must match the danger of the threat. A band of criminals charging for Depot access does not warrant a death warrant, and a murderous force that has ransacked a secure armory and is known to be heavily armed, can be dealt with by lethal force. Use the guidances in Space Law to help you issue the proper bounty terms. The amounts to issue are at your discretion. + +Assets seized of criminals may only be used to make victims whole and to pay for any fines persuant to the law. Any excess financials recieved from the sale of criminal assets is to be returned to their original owners, and are not to be plundered or extorted by security forces. This is a 0 tolerance policy and any security forces caught stealing/confiscating goods for their own gain will be dealt with administratively (banned). + +You are also permitted and expected to issue and enforce any docking fines related to loitering in the terminal, up to and including forced eviction of shuttles. Fines collected in this way are permitted to be used as payroll or the acquisition of station supplies. + +HoS is allowed to hire additional forces as they see fit to keep the sector secure. Do know that your presence and willingness to police the sector will allow piracy to occur and that choosing this role is directly to oppose the criminals and pirates preying on the good employees of NT. These security forces may have their access upgraded, and be permitted to carry security weapons (otherwise contraband), and they are also bound to follow Space Law. You are in charge of reminding them this, however any player who joins your security forces and then uses that position and its tools to harass or otherwise antagonize others should be immediately AHELP so that an admin can resolve the situation. This includes joining the force, serving for 15 minutes, and then quitting the force and using the items and tools and clothes to commit crimes. + + [color=#00c000]FRONTIER PVP AND PIRACY[/color] Violating these will result in administrative action up to and including appeal only permanent bans, up to the discretion of Frontier staff. -[color=#a4885c]01.[/color] Antag activities are only allowed when there is a confirmed security/administrative presence aboard the station. AHELP is the only guaranteed answer to this question. +[color=#a4885c]1.[/color] Antag activities are only allowed when there is a confirmed security/administrative presence aboard the station. AHELP is the only guaranteed answer to this question. -[color=#a4885c]02.[/color] The station and surrounding docking area (around 200m around the station itself) are considered a 'safe' zone and no direct or intentional antag activities are allowed within this area. This includes damaging, defacing, removing, selling, stealing, or otherwise restricting access to critical game objects like ATMs, Shipyard Consoles, Vending Machines, and all other station equipment. This is a zero tolerance policy. Treat the station similar to arrivals. +[color=#a4885c]2.[/color] The station and surrounding docking area (around 200m around the station itself) are considered a 'safe' zone and no direct or intentional antag activities are allowed within this area. This includes damaging, defacing, removing, selling, stealing, or otherwise restricting access to critical game objects like ATMs, Shipyard Consoles, Vending Machines, and all other station equipment. This is a zero tolerance policy. Treat the station similar to arrivals. -[color=#a4885c]03.[/color] Maximum crew of 4 for a pirate crew. Dont be an overwhelming force. There is no limit to the response force. +[color=#a4885c]3.[/color] Maximum crew of 4 for a pirate crew. Dont be an overwhelming force. There is no limit to the response force. -[color=#a4885c]04.[/color] Rules of escalation will follow traditional Maritime Law for cruiser(read: pirate) rules, as clarified here: +[color=#a4885c]4.[/color] Rules of escalation will follow traditional Maritime Law for cruiser(read: pirate) rules, as clarified here: [color=#00c000]MARITIME LAW AND CRUISER RULES[/color] @@ -24,7 +78,7 @@ Space Law is still to be followed and all hired Station Security and Station Adm More Frontier specific rules and information will follow here. Standard Wizard's Den rules are included below, and in any place that is not superceded by the mechanics of the game mode, the Wizard Den rules are to be followed as an absolute minimum. -[color=#ff0000]WIZDEN RULES[/color] +[color=#ff0000]WIZDEN RULES ABRIDGED[/color] This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our wiki at [color=#a4885c]wiki.spacestation14.io[/color], should you need it. @@ -42,8 +96,6 @@ This is the "short" form of the rules, which has all the information any regular [color=#ff0000]GENERAL ETIQUETTE[/color] -[color=#a4885c]06.[/color] These are English servers. Speak only English in IC and OOC. - [color=#a4885c]07.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt/crash the round/server. This includes autoclickers and scripts to automate the game or evade AFK detection. Intentionally attempting to lag/crash the server will result in an immediate appeal-only ban. [color=#a4885c]08.[/color] Don't use multiple SS14 accounts to play (referred to as "multi-keying"). Users knowingly using multiple SS14 accounts will have all of their accounts banned. @@ -59,13 +111,9 @@ This is the "short" form of the rules, which has all the information any regular [color=#a4885c]11.[/color] Act like an actual human being on a space station in a low-roleplay (LRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. Do not threaten players that you are calling the admins on them. Do not use emotes to bypass speech filters or muteness. You are not required to write a backstory or follow strict procedure; however, you are expected to at least make an effort to act like your role. [color=#a4885c]12.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. - - [color=#ff0000]The arrivals station, shuttle, and general arrivals docking area are completely off-limits to any hostile activity, including activity by antagonists. Attacking newly spawned players in these areas or damaging/sabotaging these areas is strictly forbidden.[/color] + - [color=#ff0000]The station is completely off-limits to any hostile activity, including activity by antagonists. Attacking newly spawned players in these areas or damaging/sabotaging these areas is strictly forbidden.[/color] - Do not intentionally make other players' lives hell for your own amusement. - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE END-ROUND SUMMARY APPEARS. KILLING SOMEONE FOR NO REASON BEFORE THIS WILL BE HANDLED ACCORDINGLY.[/color] - - Antagonists have a lot of leeway with this rule and may kill/sabotage as they see fit, however if your behavior degrades the experience for the majority of the server you will be told to stop. Antagonists are still forbidden from causing massive station damage early into the round (less than 30 minutes) and are forbidden from needlessly prolonging rounds. - -[color=#a4885c]13.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) - - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not. [color=#a4885c]14.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). - Using information you gain from outside your own character (such as spectating while a ghost, metacomms, or other means) to your advantage is strictly forbidden. You remember all events up until you fall unconscious, even after cloning. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life. @@ -77,43 +125,9 @@ This is the "short" form of the rules, which has all the information any regular - Adminhelp the situation if you think someone is over-escalating. - Department strikes, revolutions (ex: cargonia and any variation thereof), riots, cults, and any other type of similar largely disruptive behavior are strictly forbidden. These activities are generally antagonist-only and all players regardless of antagonist status must obtain admin permission before engaging in this behavior (you are extremely unlikely to get permission). -[color=#a4885c]16.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling") or from head roles without notifying your chain of command or administrators. - - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles. - - Head of Staff roles help drive rounds. If you need to leave, please admin-help your role and that you are leaving. There is no need to wait for a reply when admin-helping that you need to disconnect as a head role. - -[color=#a4885c]17.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming"). - - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. Have an actual reason for needing these things. - - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them. - - Don't pre-emptively hide antagonist objectives or pre-emptively secure them with higher security then normally required. - - Don't manufacture or prepare things for the "end of the round" when the shuttle docks with Central Command. - -[color=#a4885c]18.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). - - Don't openly try to cooperate with obvious or known antagonists as a non-antagonist. - -[color=#ff0000]SECURITY & COMMAND RULES[/color] -If you regularly play Security or Command roles and got this far, we applaud you for reading. These rules also apply to any individual who is promoted or is acting in the place of a Security/Command role (unless they are an antagonist). - -[color=#a4885c]19.[/color] Command and Security are held to a higher standard of play. - - Be competent in your job and department. Failure to know the basics of your department is liable to result in a job ban. - - Do not willingly and openly cooperate with terrorists/antagonists. Do not give away your objective items. Some leeway is given to making deals with antagonists if the deal benefits the safety or situation of the station as a whole and not just yourself. - - Uphold the Law & maintain order. Do not engage in lawbreaking activity or troublemaker behavior. Security is expected to intervene into criminal activity where possible. Heads of Staff are at minimum expected to report criminal activity to Security. - - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. Do not abuse your position or use it to make arbitrary choices to the detriment of the station. - - Do not hire random crew to be your bodyguards or promote random to Captain or a Head of Staff at random. If you need bodyguards, talk to your security department. If you need a new Command role, talk to the personnel in that related department. - - '''Do not abandon the station during Nuclear Operatives. You are supposed to protect the station, not let operatives kill everyone on it without a fight.''' - [color=#a4885c]20.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force: - Lethal force is used against you (ex: firearms, lasers, disabling/stunning weapons with intent to kill, deadly melee weapons) - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.). - You determine that your life or the life of an innocent is in immediate danger. - The suspect is unable to be safely detained by less-lethal means. This includes suspects who continually resist efforts to be cuffed or continually manages to escape. - - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew. - -Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. - -[color=#a4885c]21.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew, or the station at large to do so. - - Brig times should generally not exceed 10 minutes unless the crime is permabriggable. Repeat offenders or antagonists may be permabrigged. - - Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to commission crimes or items that prove problematic in possession of the detainee (tools, insulated gloves, etc.). - - Detainees that die in your custody must be cloned unless they have been (legally) executed, suicide, or there is strong reason to believe they are an antagonist. - - Executions must be for a permabriggable crime and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. Those who willingly attempt to damage/destroy or escape from the permabrig may be executed. - - Detainees in the brig have the right to know what they are being charged with, as well as basic medical aid, at least to the point they are no longer at risk of dying. - As there is no space law, Security/Command acts to maintain the safety of the station and its inhabitants, as well as Nanotrasen assets. + - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew. \ No newline at end of file From 69c6feb63965931f242d2447ab86b3b6187a6471 Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Tue, 11 Jul 2023 00:52:44 -0400 Subject: [PATCH 2/3] vend --- Resources/Maps/Shuttles/helix.yml | 261 +++--------------- Resources/Maps/frontier.yml | 43 ++- .../VendingMachines/Inventories/boozeomat.yml | 40 +-- .../VendingMachines/Inventories/cart.yml | 16 +- .../VendingMachines/Inventories/chemvend.yml | 42 +-- .../VendingMachines/Inventories/cigs.yml | 24 +- .../VendingMachines/Inventories/engivend.yml | 10 +- .../VendingMachines/Inventories/games.yml | 16 +- .../VendingMachines/Inventories/medical.yml | 2 +- .../VendingMachines/Inventories/nutri.yml | 2 +- .../VendingMachines/Inventories/salvage.yml | 6 +- .../VendingMachines/Inventories/theater.yml | 16 +- .../VendingMachines/Inventories/vendomat.yml | 16 +- .../VendingMachines/Inventories/youtool.yml | 26 +- .../Weapons/Guns/Battery/battery_guns.yml | 1 + .../Structures/Machines/vending_machines.yml | 4 +- Resources/ServerInfo/Rules.txt | 2 +- 17 files changed, 192 insertions(+), 335 deletions(-) diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml index e933d3be203..1a6ee06cdca 100644 --- a/Resources/Maps/Shuttles/helix.yml +++ b/Resources/Maps/Shuttles/helix.yml @@ -44,8 +44,7 @@ entities: type: Fixtures - type: OccluderTree - type: Shuttle - - nextUpdate: 983.2713088 - type: GridPathfinding + - type: GridPathfinding - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity @@ -359,8 +358,7 @@ entities: - type: RadiationGridResistance - id: Helix type: BecomesStation - - nextUpdate: 0 - type: SpreaderGrid + - type: SpreaderGrid - proto: AirlockChemistry entities: - uid: 273 @@ -500,6 +498,13 @@ entities: - pos: 8.5,-1.5 parent: 377 type: Transform +- proto: Beaker + entities: + - uid: 500 + components: + - pos: 2.9870691,5.506429 + parent: 377 + type: Transform - proto: BedsheetMedical entities: - uid: 166 @@ -536,6 +541,13 @@ entities: - pos: 12.344845,4.713321 parent: 377 type: Transform +- proto: BoxBeaker + entities: + - uid: 501 + components: + - pos: 4.5120697,4.656429 + parent: 377 + type: Transform - proto: BoxMouthSwab entities: - uid: 221 @@ -557,22 +569,16 @@ entities: - pos: 9.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 189 components: - pos: 10.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 196 components: - pos: 11.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 247 components: - pos: 3.5,12.5 @@ -580,15 +586,11 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 248 components: - pos: 3.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 249 components: - pos: 2.5,11.5 @@ -596,8 +598,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 250 components: - pos: 1.5,11.5 @@ -605,8 +605,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 251 components: - pos: 0.5,11.5 @@ -614,141 +612,101 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 252 components: - pos: 0.5,10.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 253 components: - pos: 4.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 254 components: - pos: 5.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 255 components: - pos: 6.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 256 components: - pos: 6.5,10.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 257 components: - pos: 4.5,10.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 258 components: - pos: 4.5,9.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 259 components: - pos: 4.5,8.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 260 components: - pos: 4.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 261 components: - pos: 3.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 262 components: - pos: 2.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 263 components: - pos: 1.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 264 components: - pos: 0.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 265 components: - pos: -0.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 266 components: - pos: -1.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 267 components: - pos: 5.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 268 components: - pos: 6.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 269 components: - pos: 7.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 270 components: - pos: 8.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 276 components: - pos: 5.5,4.5 @@ -756,64 +714,46 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 277 components: - pos: 6.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 278 components: - pos: 7.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 279 components: - pos: 8.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 280 components: - pos: 9.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 281 components: - pos: 10.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 282 components: - pos: 11.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 283 components: - pos: 12.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 284 components: - pos: 13.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 285 components: - pos: 14.5,4.5 @@ -821,8 +761,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 286 components: - pos: 5.5,4.5 @@ -830,57 +768,41 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 287 components: - pos: 4.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 288 components: - pos: 3.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 289 components: - pos: 2.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 290 components: - pos: 1.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 291 components: - pos: 0.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 292 components: - pos: -0.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 293 components: - pos: -1.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 294 components: - pos: -2.5,4.5 @@ -888,50 +810,36 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 295 components: - pos: -3.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 296 components: - pos: -4.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 297 components: - pos: -5.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 298 components: - pos: -6.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 299 components: - pos: -6.5,5.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 300 components: - pos: -6.5,6.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 301 components: - pos: 14.5,5.5 @@ -939,8 +847,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 302 components: - pos: 14.5,6.5 @@ -948,43 +854,31 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 303 components: - pos: 6.5,3.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 304 components: - pos: 6.5,2.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 305 components: - pos: 6.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 306 components: - pos: 6.5,0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 307 components: - pos: 6.5,-0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 308 components: - pos: 6.5,-1.5 @@ -992,36 +886,26 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 309 components: - pos: 7.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 310 components: - pos: 8.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 311 components: - pos: 8.5,0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 312 components: - pos: 8.5,-0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 313 components: - pos: 8.5,-1.5 @@ -1029,43 +913,31 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 314 components: - pos: 0.5,3.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 315 components: - pos: 0.5,2.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 316 components: - pos: 0.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 317 components: - pos: 0.5,0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 318 components: - pos: 0.5,-0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 319 components: - pos: 0.5,-1.5 @@ -1073,43 +945,31 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 320 components: - pos: -1.5,3.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 321 components: - pos: -1.5,2.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 322 components: - pos: -1.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 323 components: - pos: -1.5,0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 324 components: - pos: -1.5,-0.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 325 components: - pos: -1.5,-1.5 @@ -1117,43 +977,31 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 326 components: - pos: -0.5,1.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 327 components: - pos: 8.5,2.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 328 components: - pos: 8.5,3.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 379 components: - pos: -1.5,8.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 380 components: - pos: -2.5,8.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - proto: CableHV entities: - uid: 229 @@ -1161,29 +1009,21 @@ entities: - pos: 0.5,12.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 231 components: - pos: 1.5,12.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 232 components: - pos: 2.5,12.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 441 components: - pos: 0.5,10.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 446 components: - pos: 0.5,11.5 @@ -1191,15 +1031,11 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 447 components: - pos: 0.5,12.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - proto: CableMV entities: - uid: 234 @@ -1207,8 +1043,6 @@ entities: - pos: 2.5,12.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 235 components: - pos: 3.5,12.5 @@ -1216,57 +1050,41 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 236 components: - pos: 3.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 237 components: - pos: 4.5,11.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 238 components: - pos: 4.5,10.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 239 components: - pos: 4.5,9.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 240 components: - pos: 4.5,8.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 241 components: - pos: 4.5,7.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 242 components: - pos: 4.5,6.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 243 components: - pos: 4.5,5.5 @@ -1274,22 +1092,16 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 244 components: - pos: 4.5,4.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 245 components: - pos: 4.5,3.5 parent: 377 type: Transform - - fixtures: {} - type: Fixtures - uid: 246 components: - pos: 5.5,3.5 @@ -1297,8 +1109,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - uid: 275 components: - pos: 5.5,4.5 @@ -1306,8 +1116,6 @@ entities: type: Transform - enabled: True type: AmbientSound - - fixtures: {} - type: Fixtures - proto: CableTerminal entities: - uid: 230 @@ -1403,13 +1211,6 @@ entities: - pos: 4.5,3.5 parent: 377 type: Transform -- proto: ChemDispenser - entities: - - uid: 178 - components: - - pos: 4.5,2.5 - parent: 377 - type: Transform - proto: ChemistryHotplate entities: - uid: 180 @@ -1593,8 +1394,6 @@ entities: - pos: -0.5072708,8.496279 parent: 377 type: Transform - - nextSound: 168.6987588 - type: EmitSoundOnCollide - proto: ExtinguisherCabinetFilled entities: - uid: 93 @@ -2305,6 +2104,23 @@ entities: - pos: 4.5,1.5 parent: 377 type: Transform +- proto: LargeBeaker + entities: + - uid: 220 + components: + - pos: 4.6370697,4.781429 + parent: 377 + type: Transform + - uid: 498 + components: + - pos: 4.2120695,4.706429 + parent: 377 + type: Transform + - uid: 499 + components: + - pos: 2.68707,5.581429 + parent: 377 + type: Transform - proto: LockerCaptain entities: - uid: 482 @@ -2355,6 +2171,8 @@ entities: - pos: 2.5,2.5 parent: 377 type: Transform + - locked: False + type: Lock - proto: LockerChiefMedicalOfficerFilled entities: - uid: 164 @@ -3136,6 +2954,15 @@ entities: - pos: 2.5,1.5 parent: 377 type: Transform +- proto: VendingMachineChemicals + entities: + - uid: 178 + components: + - flags: SessionSpecific + type: MetaData + - pos: 4.5,2.5 + parent: 377 + type: Transform - proto: VendingMachineGeneDrobe entities: - uid: 193 diff --git a/Resources/Maps/frontier.yml b/Resources/Maps/frontier.yml index 787e4984fd1..3f0e77c02a5 100644 --- a/Resources/Maps/frontier.yml +++ b/Resources/Maps/frontier.yml @@ -3404,6 +3404,16 @@ entities: pos: -62.5,3.5 parent: 2173 type: Transform + - uid: 5801 + components: + - pos: -29.5,-30.5 + parent: 2173 + type: Transform + - uid: 5805 + components: + - pos: -30.5,-30.5 + parent: 2173 + type: Transform - proto: AirlockHeadOfPersonnelGlassLocked entities: - uid: 4113 @@ -12120,6 +12130,13 @@ entities: type: Transform - enabled: True type: AmbientSound + - uid: 5803 + components: + - pos: -3.5,41.5 + parent: 2173 + type: Transform + - enabled: True + type: AmbientSound - proto: CableMV entities: - uid: 1672 @@ -26449,6 +26466,11 @@ entities: - pos: -34.5,10.5 parent: 2173 type: Transform + - uid: 5804 + components: + - pos: -35.5,8.5 + parent: 2173 + type: Transform - proto: GeneratorWallmountBasic entities: - uid: 1829 @@ -26465,6 +26487,11 @@ entities: type: Transform - supplyRate: 6000 type: PowerSupplier + - uid: 5802 + components: + - pos: -3.5,41.5 + parent: 2173 + type: Transform - proto: Girder entities: - uid: 2785 @@ -30626,11 +30653,6 @@ entities: type: Transform - proto: RandomVendingDrinks entities: - - uid: 2210 - components: - - pos: -11.5,18.5 - parent: 2173 - type: Transform - uid: 2528 components: - pos: -2.5,37.5 @@ -34202,6 +34224,13 @@ entities: - pos: 12.5,5.5 parent: 2173 type: Transform + - uid: 2220 + components: + - flags: SessionSpecific + type: MetaData + - pos: -7.5,18.5 + parent: 2173 + type: Transform - proto: VendingMachineAstroVend entities: - uid: 2756 @@ -34247,11 +34276,11 @@ entities: type: Transform - proto: VendingMachineCigs entities: - - uid: 2220 + - uid: 2210 components: - flags: SessionSpecific type: MetaData - - pos: -7.5,18.5 + - pos: -11.5,18.5 parent: 2173 type: Transform - proto: VendingMachineCircuitVend diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 452300dae25..d90d5327135 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -1,35 +1,35 @@ - type: vendingMachineInventory id: BoozeOMatInventory startingInventory: - DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze. - DrinkShotGlass: 10 + DrinkGlass: 40 #Kept glasses at top for ease to differentiate from booze. + DrinkShotGlass: 20 DrinkGlassCoupeShaped: 10 - DrinkVacuumFlask: 5 - DrinkFlaskBar: 5 - DrinkShaker: 5 - DrinkAbsintheBottleFull: 2 - DrinkAleBottleFull: 5 - DrinkBeerBottleFull: 5 - DrinkBlueCuracaoBottleFull: 2 - DrinkCognacBottleFull: 4 - DrinkColaBottleFull: 4 + DrinkVacuumFlask: 15 + DrinkFlaskBar: 15 + DrinkShaker: 15 + DrinkAbsintheBottleFull: 4 + DrinkAleBottleFull: 15 + DrinkBeerBottleFull: 15 + DrinkBlueCuracaoBottleFull: 4 + DrinkCognacBottleFull: 6 + DrinkColaBottleFull: 10 DrinkCreamCarton: 5 - DrinkGinBottleFull: 3 + DrinkGinBottleFull: 4 DrinkGoldschlagerBottleFull: 1 DrinkGrenadineBottleFull: 2 - DrinkJuiceLimeCarton: 3 - DrinkJuiceOrangeCarton: 3 - DrinkJuiceTomatoCarton: 3 + DrinkJuiceLimeCarton: 8 + DrinkJuiceOrangeCarton: 8 + DrinkJuiceTomatoCarton: 8 DrinkCoffeeLiqueurBottleFull: 3 DrinkMelonLiquorBottleFull: 3 DrinkPatronBottleFull: 2 - DrinkRumBottleFull: 4 + DrinkRumBottleFull: 8 DrinkSodaWaterCan: 8 - DrinkSpaceMountainWindBottleFull: 3 - DrinkSpaceUpBottleFull: 3 + DrinkSpaceMountainWindBottleFull: 8 + DrinkSpaceUpBottleFull: 8 DrinkTequilaBottleFull: 3 DrinkTonicWaterCan: 8 DrinkVermouthBottleFull: 5 DrinkVodkaBottleFull: 5 - DrinkWhiskeyBottleFull: 5 - DrinkWineBottleFull: 5 + DrinkWhiskeyBottleFull: 8 + DrinkWineBottleFull: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index cb0ef3246d3..7f33db65948 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -3,14 +3,14 @@ startingInventory: PassengerPDA: 5 ClearPDA: 5 - PassengerIDCard: 5 + PassengerIDCard: 20 ClothingHeadsetGrey: 5 RubberStampApproved: 1 RubberStampDenied: 1 - Paper: 10 - EncryptionKeyCargo: 2 - EncryptionKeyEngineering: 2 - EncryptionKeyMedical: 2 - EncryptionKeyScience: 2 - EncryptionKeySecurity: 1 - EncryptionKeyService: 3 + Paper: 100 + EncryptionKeyCargo: 20 + EncryptionKeyEngineering: 20 + EncryptionKeyMedical: 20 + EncryptionKeyScience: 20 + EncryptionKeySecurity: 10 + EncryptionKeyService: 30 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index f3dc778d3a8..0f1bd95f6e6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -1,25 +1,25 @@ - type: vendingMachineInventory id: ChemVendInventory startingInventory: - JugAluminium: 2 - JugCarbon: 2 - JugChlorine: 2 - JugCopper: 2 - JugEthanol: 2 - JugFluorine: 2 - JugHydrogen: 2 - JugIodine: 2 - JugIron: 2 - JugLithium: 2 - JugMercury: 2 - JugNitrogen: 2 - JugOxygen: 2 - JugPhosphorus: 2 - JugPotassium: 2 - JugRadium: 2 - JugSilicon: 2 - JugSodium: 2 - JugSugar: 2 - JugSulfur: 2 + JugAluminium: 4 + JugCarbon: 4 + JugChlorine: 4 + JugCopper: 4 + JugEthanol: 4 + JugFluorine: 4 + JugHydrogen: 4 + JugIodine: 4 + JugIron: 4 + JugLithium: 4 + JugMercury: 4 + JugNitrogen: 4 + JugOxygen: 4 + JugPhosphorus: 4 + JugPotassium: 4 + JugRadium: 4 + JugSilicon: 4 + JugSodium: 4 + JugSugar: 4 + JugSulfur: 4 emaggedInventory: - ToxinChemistryBottle: 1 + ToxinChemistryBottle: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index a7f6dbd76d2..c0eb68e1777 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -1,16 +1,16 @@ - type: vendingMachineInventory id: CigaretteMachineInventory startingInventory: - CigPackGreen: 2 - CigPackRed: 2 - CigPackBlue: 2 - CigPackBlack: 2 - CigarCase: 1 - SmokingPipeFilledTobacco: 1 - Vape: 1 - Matchbox: 5 - PackPaperRollingFilters: 3 - CheapLighter: 4 - Lighter: 1 + CigPackGreen: 8 + CigPackRed: 8 + CigPackBlue: 8 + CigPackBlack: 8 + CigarCase: 4 + SmokingPipeFilledTobacco: 4 + Vape: 4 + Matchbox: 8 + PackPaperRollingFilters: 8 + CheapLighter: 6 + Lighter: 4 emaggedInventory: - CigPackSyndicate: 1 + CigPackSyndicate: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 4b28bd8ff27..50c4253ccff 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: EngiVendInventory startingInventory: - ClothingEyesGlassesMeson: 4 + ClothingEyesGlassesMeson: 10 ClothingHeadHatWelding: 6 - Multitool: 4 - NetworkConfigurator: 5 - PowerCellMedium: 5 - ClothingHandsGlovesColorYellow: 6 + Multitool: 8 + NetworkConfigurator: 15 + PowerCellMedium: 15 + ClothingHandsGlovesColorYellow: 8 InflatableWallStack1: 24 InflatableDoorStack1: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index 059ce5f9bbf..8861ce78f39 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: GoodCleanFunInventory startingInventory: - DiceBag: 4 - Paper: 8 - d6Dice: 8 - ChessBoard: 1 - BackgammonBoard: 1 - ParchisBoard: 1 - CheckerBoard: 1 - BooksBag: 3 + DiceBag: 10 + Paper: 80 + d6Dice: 16 + ChessBoard: 10 + BackgammonBoard: 10 + ParchisBoard: 10 + CheckerBoard: 10 + BooksBag: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index a20d6f77bf3..c9f7f4b0b57 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -1,7 +1,7 @@ - type: vendingMachineInventory id: NanoMedPlusInventory startingInventory: - HandheldHealthAnalyzer: 9 + HandheldHealthAnalyzer: 10 Brutepack: 15 Ointment: 15 Bloodpack: 15 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml index 4b8b8392ef8..1b2cc45b243 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml @@ -11,7 +11,7 @@ WeedSpray: 20 PestSpray: 20 Syringe: 5 - RobustHarvestChemistryBottle: 3 + RobustHarvestChemistryBottle: 8 Bucket: 3 DiseaseSwab: 20 #TO DO: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index f05d6322f1f..3dd4367f403 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -5,9 +5,9 @@ Pickaxe: 8 OreBag: 6 Flare: 4 - FlashlightLantern: 5 - Floodlight: 4 - HandheldGPSBasic: 4 + FlashlightLantern: 15 + Floodlight: 10 + HandheldGPSBasic: 14 RadioHandheld: 5 WeaponCrusher: 5 WeaponCrusherDagger: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 366aaf574c7..6e9fbf38b58 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: AutoDrobeInventory startingInventory: - ClothingHeadHatJester: 1 - ClothingUniformJumpsuitJester: 1 - ClothingHeadHatJesterAlt: 1 - ClothingUniformJumpsuitJesterAlt: 1 - ClothingShoesJester: 2 - ClothingOuterWinterClown: 1 - ClothingOuterWinterMime: 1 - ClothingOuterWinterMusician: 1 + ClothingHeadHatJester: 8 + ClothingUniformJumpsuitJester: 8 + ClothingHeadHatJesterAlt: 8 + ClothingUniformJumpsuitJesterAlt: 8 + ClothingShoesJester: 8 + ClothingOuterWinterClown: 4 + ClothingOuterWinterMime: 4 + ClothingOuterWinterMusician: 4 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index 2ef1ad62fe6..61f31f36478 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: VendomatInventory startingInventory: - RemoteSignaller: 1 - Wirecutter: 1 - CableApcStack: 2 - FlashlightLantern: 2 - PowerCellSmallPrinted: 3 - MatterBinStockPart: 4 - CapacitorStockPart: 4 - MicroManipulatorStockPart: 4 \ No newline at end of file + RemoteSignaller: 20 + Wirecutter: 30 + CableApcStack: 12 + FlashlightLantern: 12 + PowerCellSmallPrinted: 20 + MatterBinStockPart: 8 + CapacitorStockPart: 8 + MicroManipulatorStockPart: 8 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 154723c9f5a..210f0de3b68 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -1,18 +1,18 @@ - type: vendingMachineInventory id: YouToolInventory startingInventory: - CableApcStack: 5 - Crowbar: 5 - Welder: 3 - Wirecutter: 5 - Wrench: 5 - Screwdriver: 5 - trayScanner: 5 - NetworkConfigurator: 3 - GasAnalyzer: 5 - FlashlightLantern: 5 - ClothingHandsGlovesColorYellowBudget: 5 - AirlockPainter: 3 + CableApcStack: 20 + Crowbar: 15 + Welder: 13 + Wirecutter: 15 + Wrench: 15 + Screwdriver: 15 + trayScanner: 15 + NetworkConfigurator: 13 + GasAnalyzer: 15 + FlashlightLantern: 15 + ClothingHandsGlovesColorYellowBudget: 30 + AirlockPainter: 20 # Some engineer forgot to take the multitool out the youtool when working on it, happens. contrabandInventory: - Multitool: 1 + Multitool: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 640b606020d..243eb3a5c38 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -299,6 +299,7 @@ steps: 5 zeroVisible: true - type: Appearance + - staticPrice: 200 - type: entity name: practice disabler diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index dc384ecce94..150bf523d12 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1884,5 +1884,5 @@ map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: AccessReader - access: [["Chemistry"]] + - type: MarketModifier + mod: 5 diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt index 6e6620a08c0..93324f98770 100644 --- a/Resources/ServerInfo/Rules.txt +++ b/Resources/ServerInfo/Rules.txt @@ -47,7 +47,7 @@ The Head of Personnel is a very busy role, and there may at times require multip Head of Security is in charge of keeping the sector free of piracy and general criminality. We will be enforcing Space Law as found here: https://wiki.nyanotrasen.moe/view/Space_Law as best interpreted for the Frontier. This includes ensuring the safety and well being of all prisoners and suspects, the fair treatment of all players, along with sentencing guidelines and procedures. -They are permitted to issue bounties for the capture of known hostile forces in the sector. The terms of capture must match the danger of the threat. A band of criminals charging for Depot access does not warrant a death warrant, and a murderous force that has ransacked a secure armory and is known to be heavily armed, can be dealt with by lethal force. Use the guidances in Space Law to help you issue the proper bounty terms. The amounts to issue are at your discretion. +They are permitted to issue bounties for the capture of known hostile forces in the sector. Bounties should be announced either at the communications terminal or through stamped fax from an official fax machine. The terms of capture must match the danger of the threat. A band of criminals charging for Depot access does not warrant a death warrant, and a murderous force that has ransacked a secure armory and is known to be heavily armed, can be dealt with by lethal force. Use the guidances in Space Law to help you issue the proper bounty terms. The amounts to issue are at your discretion. Assets seized of criminals may only be used to make victims whole and to pay for any fines persuant to the law. Any excess financials recieved from the sale of criminal assets is to be returned to their original owners, and are not to be plundered or extorted by security forces. This is a 0 tolerance policy and any security forces caught stealing/confiscating goods for their own gain will be dealt with administratively (banned). From 3ab88c33ccf1e0221d8ed17cda647ca20b0f82ef Mon Sep 17 00:00:00 2001 From: Cheackraze <71046427+Cheackraze@users.noreply.github.com> Date: Tue, 11 Jul 2023 00:58:58 -0400 Subject: [PATCH 3/3] dun --- .../_NF/GameRule/NfAdventureRuleSystem.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs index e8dd4b4da5b..5c03127f7b4 100644 --- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs +++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs @@ -112,7 +112,30 @@ private void OnStartup(RoundStartingEvent ev) { var seed = _random.Next(); - var offset = _random.NextVector2(1500f, 3500f); + var offset = _random.NextVector2(2100f, 4500f); + if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions + { + Offset = offset + })) + { + continue; + } + + var mapGrid = EnsureComp(grids[0]); + _shuttle.AddIFFFlag(grids[0], IFFFlags.HideLabel); + _console.WriteLine(null, $"dungeon spawned at {offset}"); + offset = new Vector2(0, 0); + + //pls fit the grid I beg, this is so hacky + //its better now but i think i need to do a normalization pass on the dungeon configs + //because they are all offset + _dunGen.GenerateDungeon(dunGen, grids[0], mapGrid, (Vector2i) offset, seed); + } + foreach (var dunGen in dungenTypes) + { + + var seed = _random.Next(); + var offset = _random.NextVector2(2300f, 6500f); if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions { Offset = offset