Better mapping editor (Part 1 - UI) #34302
Open
+2,218
−459
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Wanted to make another feature suggestion: could you add plus and minus buttons to the draw depth box, to quickly change the draw depth for decals? In current mapping I found this really annoying where I had to heavily use my keyboard to change the draw depth, often happens when editing previous decals. |
|
By the way, I am getting to this PR its just really big! I haven't forgotten about it :) |
| topLevel.Children.Add(prototype); | ||
| } | ||
| Screen.Entities.UpdateVisible( | ||
| new ([entities]), |
There was a problem hiding this comment.
Suggested change
| new ([entities]), | |
| [entities], |
There was a problem hiding this comment.
Weh, I remembered why I did it that way, because typecheck fails for some reason when written that way.
| prototype.Children?.Sort(Compare); | ||
| } | ||
| Screen.Tiles.UpdateVisible( | ||
| new ([tiles]), |
There was a problem hiding this comment.
Suggested change
| new ([tiles]), | |
| [tiles], |
|
|
||
| topLevel.Children.Sort(Compare); | ||
| Screen.Decals.UpdateVisible( | ||
| new ([decals]), |
There was a problem hiding this comment.
Suggested change
| new ([decals]), | |
| [decals], |
Comment on lines
+601
to
+605
| button.CollapseButton.Pressed = true; | ||
| list.ToggleCollapse(button); | ||
| OnSelected(list, button, prototype.Prototype); | ||
| children = button.ChildrenPrototypes.Children.ToList(); | ||
| children.AddRange(button.ChildrenPrototypesGallery.Children); |
There was a problem hiding this comment.
this loop structure isn't new to the PR but wow this is hard to follow
There was a problem hiding this comment.
I don't know what's wrong with it or how it can be improved. These two functions do the same thing, just with different arguments.
|
|
These buttons were in the full version of the PR, on the advice of one of the maintainers I decided to split it into several parts, the buttons will be in the second one. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
I'm going to try and champion some eyeballs on this in the Discord's pull request review request channel. Having watched a mapper use this for a little bit: there's two things that could be improved for the UX at the moment.
I think problem 1 is a must-fix at the moment. |
|
Yes, those are the right points, I'll definitely look into them,but it's hard to make myself work when none of the maintainers have ever really looked at the PR 😆 |
Funny, but it took one line of code to do it. Fixed |
Added buttons to hide/open each list. |
|
Thanks! I'm continuing to raise this in the Discord, here's some feedback from a mapper who tested it
Will keep pinging on this so it doesn't get buried 🫡 It took a really long time for the last mapping UI overhaul to go in - that was Smug's right at the start of 2024 IIRC - so please don't be discouraged if this takes a while. It's still a really useful tool as-is because this build can be used to make and edit maps that work on live. |
|
About the first, all hotkeys can be changed in the settings, in the “mapping” or “editor” section, I don't remember exactly. What about resizing the layout, I tried to do that, but because of the two nested SplitContainers needed for the flip function, I don't know how to implement it. |
|
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Peptide90
added a commit
to Vault-Overseers/nuclear-14
that referenced
this pull request
Feb 23, 2025
* Fix Mining Drills & Reduce Stamina Cost (#1579)
# Description
Fixes the attack values of mining weapons which were messed up in the
Wizmerge.
For the pickaxe, I reverted all damage values to be the same as before.
For the mining drill however, I opted to keep the rapid fire rate
because it was an interesting effect and just added the extra range from
pre-wizmerge and the throwing damage back. I also **greatly reduced the
mining drill's stamina cost** because it was a common complaint among
players.
Before the wizmerge, the mining weapons (pickaxe and drill) were in
`Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml` but
they got moved to
`Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml` and
thus the EE-specific changes got wiped.
Also fixes a subtle bug in `SharedMeleeWeaponSystem.OnMeleeSelected`,
responsible for resetting the cooldown of a melee weapon upon selecting
it, that treated attack rate as attacks per second as opposed to seconds
per attack :
```diff
private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
{
...
- var minimum = curTime + TimeSpan.FromSeconds(1 / attackRate);
+ var minimum = curTime + TimeSpan.FromSeconds(GetAttackRate(uid, args.User, component));
if (minimum < component.NextAttack)
return;
component.NextAttack = minimum;
DirtyField(uid, component, nameof(MeleeWeaponComponent.NextAttack));
}
```
Bug above was particularly noticeable for weapons with a very fast
attack rate like the mining drill and north stars, which caused the
`NextAttack` delay on select to be 4 seconds instead of 0.25 seconds.
Another subtle issue, the Goliath's attack rate field was `0.75` but the
field was set from Wizden and means attacks per second, not seconds per
attack so I changed it `1.33`.
## Media
**Pickaxe**
<img width=300px
src="https://github.com/user-attachments/assets/8bf1290e-6506-4ac8-9b8b-2bb23a2013b6">
**Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/2f852a29-7b58-4e33-8264-67bab87254fd">
**Diamond Tipped Mining Drill**
<img width=300px
src="https://github.com/user-attachments/assets/750fa019-17dc-4d21-900c-88526c873771">
**Mining with Mining Drill**
https://github.com/user-attachments/assets/a9822ccb-c991-4341-a076-fd89a8689e0c
## Changelog
:cl: Skubman
- fix: The mining drill now has a fast fire rate and extra range again.
- fix: The pickaxe and the mining drill can now be used as throwing
weapons again.
- fix: Fixed a bug where selecting weapons with a fast attack rate took
a few seconds before you could attack with them.
- fix: Fixed the Goliath attacking too fast.
- tweak: The power attack stamina cost of mining drills has been reduced
to 0.7 stamina.
- tweak: Re-adjusted the damage of the pickaxe.
* Automatic Changelog Update (#1579)
* Add Magistrate, Dignitary Department, and Minor FTL Fixes (#1536)
# Description
This adds the Magistrate to the role list of Central Command VIPs. This
also splits up the Central Command VIPs into their own department named
"Dignitary" for the purpose of making it clear that Central Command VIPs
are above Command and should be responding to orders from Central
Command.
---
# TODO
Lots of stuff to do here, mostly just transferring Chief Justice's
loadout to also work for Magistrate (most of it). I'll also list the
basics I've done as well.
### Magistrate-Specific
- [x] Add Magistrate-only Access (for locker).
- [x] Add Magistrate Job, Job Icon, and PlayTimeTracker
- [x] Add Magistrate clothes (ported from PS13)
- [x] Add Magistrate job spawner.
- [x] Add Magistrate Locker Teleporter and Locker.
- [x] Add Magistrate Contents to Locker.
- [x] Add Magistrate loadout (Chief Justice included).
- [x] Add Magistrate stamp and stamped icon.
### Dignitary Department
- [x] Add Dignitary Department.
- [x] Put Magistrate, Blueshield Officer, and Nanotrasen Representative
in Dignitary.
- [x] Add FTL for Dignitary.
- [x] Put Dignitary above Command.
### Map Stuff
- [x] Add Magistrate job spawners to maps.
- [x] Add a Centcom Wintercoat to NTR and Magistrate on the Glacier
map.\
### Extras/Fixes
- [x] Add winter coats for Magistrate and NanoRep on Glacier.
- [x] Fix the category grouping FTL for NTR and BSO.
---
# Media
<details><summary><h3>Lobby/Customization Screenshots</h3></summary>
<p>
Jobs Listing
Category Grouping
</p>
</details>
<details><summary><h3>Items/Clothes/Entities</h3></summary>
<p>
Stamps (Stamp shows the same in the spawn menu)
Magistrate Robes
Spawner & Magistrate Robes
Access List
PDA Crew Manifest
Lockers with Teleporter
Locker with Contents (from Teleported Locker)
</p>
</details>
<details><summary><h3>Map Spawners</h3></summary>
<p>
Arena
Asterisk
Core
Edge
Europa
Gaxstation
Glacier (Winter Coats for NTR and Magistrate as well.)
Hammurabi
Hive
Lighthouse
Meta
Pebble
Radstation
Saltern
Shoukou
Submarine
Tortuga
</p>
</details>
<details><summary><h3>Misc. Minor Fixes</h3></summary>
<p>
Chief Justice Access
Category Groupings (BSO AND NTR)
</p>
</details>
---
# Changelog
:cl:
- add: Added Magistrate role.
- add: Added Dignitary Department.
- add: Added winter coats for NTR and Magistrate on Glacier Spawn.
- tweak: Moved Blueshield Officer and Nanotrasen Representative to
Dignitary Department.
- fix: Fixed the category groups identifier for BSO and NTR in Loadouts.
- fix: Fixed Chief Justice tag in ID Card Computer.
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1536)
* Vigor Buff & Lethargy Nerf (#1578)
# Description
Adds new attributes to Vigor and Lethargy to catch up with the recent
traits:
Vigor:
- Still has +10 stamina
- Now increases stamina regen per second from 3 to 3.6
- Time to regenerate 50 stamina: ~13.8 seconds
- (As a reference, the base time to regenerate 50 stamina with 3 regen
is ~16.6 seconds)
- Now reduces the delay of stamina regen after stamina damage from 3
seconds to 2.25 seconds
Lethargy:
- Still has -15 stamina
- Now decreases stamina regen per second from 3 to 2.4
- Time to regenerate 50 stamina: ~20.8 seconds
- Now increases the delay of stamina regen after stamina damage from 3
seconds to 3.75 seconds
As a bonus change to be consistent with the traits, Onis and Felinids
now have their stamina regen scaled precisely with their non-standard
stamina points, such that the time where they regenerate all their
stamina is the exact same. Onis have (3 * 1.15) 3.45 stamina regen, and
Felinids have (3 * 0.85) 2.55 stamina regen.
## Why / Balance
Vigor/Lethargy was one of the traits designed early in Einstein Engines'
lifetime. For better or for worse, Vigor has been powercreeped by
several traits in the same cost bracket:
Why get a +10 stamina stat increase when for the same points you can
either have a constant source of power attacks (Martial Artist),
traverse difficult terrain faster (Parkour Training), or have a constant
10% armor (Dermal Armor)?
Adding faster stamina regen could mean more stamina for Power Attacks in
prolonged fights, and being able to recover from stamina slowdowns
faster, escaping bad situations more efficiently. This makes Vigor more
or less up to par with the new traits.
## Media
**New Vigor Description**
**New Lethargy Description**
## Changelog
:cl: Skubman
- add: The Vigor trait now has additional effects! Aside from increasing
stamina, Vigor now increases stamina regen per second, and reduces the
delay of stamina regen after taking stamina damage. The opposite effects
have been added to the Lethargy trait.
- tweak: The Oni species now has slightly increased stamina regen, and
Felinids decreased stamina regen.
* Automatic Changelog Update (#1578)
* Fix Sophia Sending a Massive Float to Chat (#1581)
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- fix: Fixed full glimmer float being displayed to chat by Sophia.
* Automatic Changelog Update (#1581)
* Make Room for Longer Chem Names. (#1582)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
Fixed not having enough space for longer chemicals on the ChemMaster UI.
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- fix: Fixed not having enough space for longer chemicals on the
ChemMaster UI.
* Automatic Changelog Update (#1582)
* IPCs Can Cryo Again (#1583)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
My bad
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- fix: Fixed IPCs being unable to cryo.
* Automatic Changelog Update (#1583)
* Split All CVars Into Separate Files (#1587)
# Description
This PR splits all the CVars into separate files. Unfortunately I need
to hella clean this up by restoring all the CVars that are different on
EE, because cherrypicking it reset everything to Wizden's Defaults
(Including CVars that no longer exist on EE, and removing CVars from
systems I codeown now, such as Atmos, Guns, and Melee).
# Changelog
No changelog because this isn't player facing. :)
---------
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
* Add Classic Asimov Laws (#1588)
# Description
This PR adds in the classic Asimov's Three Laws of Robotics as a
standard lawset for Synthetics. The laws are given thus.
Law 1: A robot may not injure a human being or, through inaction, allow
a human being to come to harm.
Law 2: A robot must obey the orders given it by human beings except
where such orders would conflict with the First Law.
Law 3: A robot must protect its own existence as long as such protection
does not conflict with the First or Second Law.
The localizations for them are intentionally left exactly-as-is from the
original 3 laws written by Isaac Asimov. Yes this is totally different
from "Crewsimov", yes this does actually mean an Asimov AI isn't
required to obey orders given to it by a Moth. Yes this does actually
mean that the AI isn't allowed to "Harm" nukies so long as it can verify
that the Nukie in question is a human.
Also includes this cherry-pick
https://github.com/space-wizards/space-station-14/pull/31040
Because this is a fix for a crash that was happening in my dev
environment...
# TODO
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
:cl:
- add: Added the classic Asimov's Three Laws of Robotics to the game.
- add: AI now starts with Asimov laws by default, instead of
"Crewsimov".
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
* Automatic Changelog Update (#1588)
* ChemMaster+ (#1585)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Changes how the ChemMaster works:
1. Removes the amount buttons and instead uses a textbox that resets
whenever a value is entered or focus ends.
2. Shrinks the ChemMaster again.
3. Adds sorting options, including for quantity, last added, and a sort
option for the (default) alphabetical order.
4. Sorting options save via the ChemMaster itself, not per-user.
Video showcase:
https://discord.com/channels/1218698320155906090/1218698321053356060/1330129166384894046
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- add: Added sorting options to the ChemMaster.
- add: Added the ability to input custom amounts into the ChemMaster via
a textbox that resets on change.
- tweak: The width of the ChemMaster UI has been lowered.
- remove: Removed quantity buttons from the ChemMaster.
---------
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1585)
* Remove Default Scream Action (#1589)
# Description
This PR adds a new server configuration that disables the special Scream
Action that all players spawn with. It's stupid, it's NRP. And you can
still scream with the emote or emote wheel. If the config is set to
false at roundstart, the Scream action simply won't spawn.
# Changelog
:cl:
- tweak: The "Scream Action" no longer appears by default. It may be set
in your server's configuration to spawn or not.
* Automatic Changelog Update (#1589)
* Update build-test-debug.yml
* Update CCVars.Misc.cs (#1590)
# Description
Apparently a lot of people were extremely angry that this was defaulted
false.
# Changelog
:cl:
- tweak: Scream is once again by default on the action bar. The server
configuration for removing it still exists however.
* Automatic Changelog Update (#1590)
* fix whitelist.enabled test fail
* Update PoolTestLogHandler.cs
* Fix Cargo Shuttle
* Fix Lathe Issue
* More various fixes
* More Fixes
* Network Configurator Fixes (#1592)
# Description
Fixes the infamous "local entity uid 0" error (hopefully forever)
Also fixes the infamous Access denied with network configs in mapping
mode.
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- fix: Fixed the infamous "Access denied" when using a network config in
mapping mode.
---------
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic Changelog Update (#1592)
* aaaaa
* Disable Blood Traits For Lamia (#1586)
# Description
It turns out that when you have a species that has 20x the blood volume
of a human, letting them take a trait that makes them constantly bleed
some percentage of their blood volume causes a lot of problems. Usually
by FLOODING the station with blood. This PR just makes Lamia ineligible
for the two blood traits, it unfortunately doesn't fix the issue of them
excessively bleeding when you attack them(I actually don't fully
consider it to be an issue. I have issues instead with system instances
of hardcoded blood amounts).
# Changelog
:cl:
- remove: Lamia can no longer take blood related traits, such as Blood
Deficiency.
* Automatic Changelog Update (#1586)
* Add mapping editor (#23427)
* Add mapping editor (#757)
* Remove mapping actions, never again
* Cleanup actions system
* Jarvis, remove all references to CM14
* Fix InventoryUIController crashing when an InventoryGui is not found
* Rename mapping1 to mapping
* Clean up context calls
* Add doc comments
* Add delegate for hiding decals in the mapping screen
* Jarvis mission failed
* a
* Add test
* Fix not flushing save stream in mapping manager
* change
* Fix verbs
* fixes
* localise
---------
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
* Fix coords monitor in replays (#29512)
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic.
Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
* Fix Airlock Error (#1593)
fixes the "missing layer" error
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Fix verbs in mapping state (#30631)
* MORE FIXES
* Update CCVars.Whitelist.cs
* IPCs dont have blood
* Update CCVars.Admin.Logs.cs
* SHUT
* aaaaaaaaaaaa
* Automatic Changelog Update (#1455)
* Fix verb sub (#30667)
* Fix verb sub
Mapping casualty, verbs are weird.
* also this
* Fix Hissing & Another Airlock Error (#1596)
errors/test fail ops
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update miningrock.yml (#1595)
Yeets a heisentest.
* There's literally no reason to do this because it impacts only the people who don't know.
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* 1984 "Unobtainium Chemistry" (#1600)
# Description
Making chems use Unobtainium Reagents doesn't make chemistry
interesting, it makes medical gameplay boring. This PR replaces the
unobtainium recipes with suitably expensive and/or complicated recipes.
Have fun memorizing how to make Acetone, Ammonia and Impedrezine.
# Changelog
:cl:
- remove: 1984'd most instances of "Unobtainium" chemistry. Chems like
Necrosol that previously required normally unobtainable reagents such as
Cognizine or Vestine now instead have long production chains of chems
that are obtainable, but complicated to produce. Check the chemistry
menu for more information.
* Automatic Changelog Update (#1600)
* Update CargoTest.cs
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Consolidate Arsenal Research
* Update arsenal.yml
* aaaaaaaa
* aaaaaaaa
* Consolidate Civilian Research
* Automatic Changelog Update (#1602)
* Automatic Changelog Update (#1603)
* Arsenal Tacsuit Research (#1604)
# Description
This PR fills in the basics for the previously commented placeholders
for "Advanced Tacsuits" and "Prototype Tacsuits", both new Arsenal
researches. These both unlock recipes for manufacturing tacsuits at a
Security Techfab, and are an alternative method to making them outside
of buying them through Cargo. Here's a genuine reason for Epistemics to
consider doing Arsenal T3.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
:cl:
- add: Added Advanced Tacsuits, and Prototype Tacsuits to Arsenal
research. Along with them comes Security Techfab recipes for said
tacsuits.
* Automatic Changelog Update (#1604)
* Replace Tech Lockout With Softcap (#1605)
# Description
This PR fully replaces the "Tier 3 Tech Lockout" with a research
softcap. How it works is that technologies are allowed to set a softcap
contribution, meaning that they multiplicatively increase the cost of
all other research by a certain amount. By default, this is done by all
Tier 3 Technologies. Essentially, this means that you're no longer
limited to a single research category's tier 3 selections. Instead the
costs of research increase the more capstones you unlock. The current
cost increase for research is displayed on the console.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
# Changelog
:cl:
- remove: Removed the "Tier 3 Tech Lockout" mechanic. You are no longer
limited to 1 discipline worth of t3 research.
- add: Research is now "Softcapped" by Tier 3 unlocks. Each unlocked
Tier 3 technology multiplicatively increases the cost of all other
research. Rushing a capstone can be quite expensive, as will be getting
multiple capstones. I hope you're glad that you can build more than one
prober now without guaranteeing the station will explode.
* Automatic Changelog Update (#1605)
* Fix Possible Loadout Related Crash (#1607)
# Description
Servers are occasionally experiencing roundstart crashes, and the logs I
received concerning this crash imply that LoadoutSystem is SOMEHOW being
handed a player character that doesn't actually exist. Well an easy
solution I guess is to just make LoadoutSystem check if the entity
*factually* exists, before attempting to apply a loadout to it.
# Changelog
:cl:
- fix: Possibly fixed a crash related to Loadouts being applied to
entities that don't exist.
* Automatic Changelog Update (#1607)
* Augustine Lawset (#1609)
# Description
New lawset, see media.
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl: Rane
- add: Added Augustine lawset as a middle ground between Asimov and
Crewsimov.
* Automatic Changelog Update (#1609)
* v240.1.0 (#1606)
it's an engine update folks
---------
Co-authored-by: Tobias Berger <toby@tobot.dev>
* Make CODEOWNERS (#1608)
maintainers get over here
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Signed-off-by: Skubman <ba.fallaria@gmail.com>
Co-authored-by: Skubman <ba.fallaria@gmail.com>
* ATS V2 (#1612)
# Description
Howdy, y'all, I just wanted to give you a quick update on the ATS. I've
added the proper tiny fan, add snacks, and drinks vendors, and some
lighting.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
:cl: Mike32oz
- add: ATS, light post, snacks/drinks vendors.
- tweak: ATS, tiny fan, convenient belt.
- remove: ATS, spawn-MobBear in the Maintenance room.
* Automatic Changelog Update (#1612)
* Modular Computers Part 2: Disk Burner (#1580)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
This is **Part 2** of the Modular Computers system, adding the
functional player facing stuff- the modular computer itself, a way to
make and burn disks via the Disk Burner and a related research.
Also comes with some cleanup changes to fix parts of the system that
broke in testing.
---
# TODO
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [x] Actually run through this thing when my laptop is out of battery
(everything worked except CONSTRUCTING the disk burner)
- [ ] Add disk burning delay, make it more intuitive? Maybe a guidebook
entry?
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
NO.
</p>
</details>
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- add: Added the Disk Burner, the Modular Computer as a board and a way
to make computer disks.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Signed-off-by: Eris <erisfiregamer1@gmail.com>
Signed-off-by: Eris <eris@erisws.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1580)
* Update CODEOWNERS (#1613)
* Mapping Mini-Wizmerge & New Central Command (#1610)
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Ports https://github.com/space-wizards/space-station-14/pull/32294
Ports https://github.com/ss14-harmony/ss14-harmony/pull/310 (and
everything needed for it to function)
Early-merges
https://github.com/space-wizards/space-station-14/pull/34302
Adds the ability for multiple central command maps that get randomly
selected.
Tested and works.
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl: Several contributors
- add: Added a new central command map that is randomly picked alongside
the old one (thank you to Spanky from Harmony)
- add: Added Advanced SMES for mappers.
- add: Added the atmospheric network monitor for seeing what the
temperature, moles, and pressure is on every pipe everywhere through a
computer.
- add: Nukie med bundle now contains a compact defibrillator.
- add: Ported a better mapping editor.
- add: Added the throngler plushie.
- remove: Removed the Throngler as a possible loot spawn for gamble
crates.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1610)
* Update Credits (#1594)
This is an automated Pull Request. This PR updates the GitHub
contributors in the credits section.
Co-authored-by: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Fix Fent Zombies in Medbay (#1614)
(fix medbays making people go up/down if they speak)
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- fix: The medbay fent zombie epidemic is now fixed.
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
* Automatic Changelog Update (#1614)
* Psionics Registry Computer, PsiWatch, and Epi-Glasses/Epi-HUD (#1598)
# Description
This adds the wonderful `Psionics Registry Computer` which allows you
to, just like Criminal Records, mark people that will show their icons
to other individuals wearing the appropriate gear, and will allow you to
keep track of such individuals in a similar way by making a `PsiWatch`
app that will show the reasons.
For the purposes of easement, I've left the fingerprints and DNA in
there, but individuals will not show up with it in the actual file. The
game would just crash when I removed the filters, so I left them in. The
dropdown also just looked cleaner when it was there instead of removing
it and replacing it with a label.
I've recolored the sprites for the sec-glasses and sec-HUD to make the
epi-glasses and epi-HUD using Epistemics colors.
I've recolored the sprite for the CriminalRecords computer to look
different and be cool.
---
# TODO
A list of things I've done split into categories.
### Spriting
- [x] (Recolor) Sprite the epi-glasses and epi-HUD.
- [x] Sprite the PsionicsRecords computer screen.
- [x] Sprite the Psionics Status icons.
- [x] Change the sprite for the Psionics Abusing (it is hard to tell any
difference from suspected right now).
### Records
- [x] Set up records XAML that basically duplicates the Criminal
Records.
- [x] Remove History (not necessary).
- [x] Change all the naming schema to match.
- [x] Change the categories and setup reason-requirement for each
submission type.
- [x] Change the "reason" to "psionics" so it is more intuitive.
### Computer Setup
- [x] Setup computer to show UI.
- [x] Setup system to report to report to Epistemics (Science) radio
when anything is changed.
- [x] Setup the system to only accept Epistemics (Research) access.
- [x] Setup the computer board.
- [x] Setup the sprites for the computers.
### Equipment and Icons
- [x] Create the icons and ensure the ShowPsionicsRecordIcons prototype
works.
- [x] Create the entity prototypes for the glasses and HUD in the game
to show textures.
- [x] Set it up so the glasses and HUD show the user the icons when
they're wearing them (having hard time fixing this at 06:00 in the
morning).
### PDA App
- [x] Setup the PDA app to mimic the SecWatch app as its own (PsiWatch).
- [x] Add the PDA app cartridge to Chaplain, Mantis, Cataloguer, and
Mystagogue.
- [x] Add cartridge to the Mystagogue locker (so they can give others
it).
### Loadouts
- [x] Add the epi-HUD to the Chaplain, Mantis, Cataloguer and
Mystagogue.
- [x] Add the epi-glasses to the Mystagogue.
- [x] Add the epi-glasses to Chaplain, Mantis, and Cataloguer (for 3
points).
### Mapping
- [x] Add the Psionics Registry Computer to every map.
### Miscellaneous Fixes/Changes
- [x] Make the computer only work for Chaplain (Chapel), Cataloguer
(Library), Mantis (Mantis), and Mystagogue (ResearchDirector).
- [x] Fix Chaplain PDA (did not have any programs installed
automatically, now it does).
---
# Media
I will add more media when I finish the rest. For now, it's just us.
<details><summary><h3>Registry Working</h3></summary>
<p>
https://github.com/user-attachments/assets/f534a1b6-6873-4bcd-9fe5-c7138069ecc0
</p>
</details>
<details><summary><h3>Loadouts and PsiWatch</h3></summary>
<p>
Cataloguer
Chaplain
Mantis
Mystagogue
---
No Users in PsiWatch
Suspected in PsiWatch
Registered in PsiWatch
Abusing in PsiWatch
PsiWatch in PDA
Picture of the PDAs and PsiWatch Cartridge
---
Mystagogue Lockers with PsiWatch Cartridge
</p>
</details>
<details><summary><h3>Mapping Locations</h3></summary>
<p>
Arena
Asterisk
Core
Edge
Europa
Gaxstation
Glacier
Hive
Lighthouse
Meta
Pebble
Radstation
Saltern
Shoukou
Submarine
Tortuga
</p>
</details>
---
# Changelog
:cl:
- add: Added Psionics Registry Computer. Now you can record Psionics
users in Epistemics.
- add: Added epi-glasses and epi-HUD to see Psionics Users icons.
(Chaplain, Cataloguer, Mantis, and Mystagogue have access in loadout).
- add: Added PsiWatch. Now you can see the Psionics Records data on your
PDA!
- fix: Fixed Chaplain not having any programs in their PDA on spawn.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1598)
* Update Redshirt Trait Description (#1616)
# Changelog
:cl:
- tweak: Made the Redshirt trait's description say what it does
Signed-off-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#1616)
* BSO Changes - Headset and MedTek (#1617)
# Description
This gives the Blueshield Officer a Central Command Headset and gives
them MedTek as well (by giving ERT Leader MedTek).
The Blueshield Officer should have access to a Central Command Headset
to communicate with the other Dignitaries (NTR and MAG) and to
communicate with Central Command if they are the only acting Dignitary
as well.
The Blueshield Officer should have access to MedTek since they already
have access to their sunglasses so that they can check the injuries of
an injured command without needing a health analyzer.
---
# Changelog
:cl:
- add: Added MedTek to Blushield Officer PDA.
- tweak: Blueshield Officer now has a Central Command Headset instead of
an All-Access Command Headset.
* Automatic Changelog Update (#1617)
* Supermatter Fixes (#1618)
# Description
Supermatter was essentially interacting with atmos about 20 to 60 times
faster than the atmos system was doing its own calculations, since *at
least some of atmos* is differentiated with respect to time, whereas
Supermatter was not. Thus supermatter was updating atmos fully every
single tick, whereas elsewhere these variables were being divided by the
delta time(multiply by Update(frameTime)). You can think of these
equations as, "How much it is modified per unit of time", and
multiplying by frameTime is the same as making it, "Per second".
This should rather dramatically cut down on the problem Supermatter has
where its seemingly going to explode every single round if even the
tiniest thing goes wrong, and that nothing you could do could save it if
it catches fire.
# Changelog
:cl:
- fix: Fixed the Supermatter engine math so that it actually respects
the server's tickrate. It should now be SIGNIFICANTLY less likely to
enter a plasma fire death spiral. If it does catch fire, just make sure
coolant is being pumped into the engine, and start blasting it with a
fire extinguisher.
* Automatic Changelog Update (#1618)
* Show Puddles and Footsteps in Context Menu (#1620)
for our janitors
:cl:
- tweak: Tweaked puddles and footsteps to be able to see them in context
menu.
---------
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Automatic Changelog Update (#1620)
* Newtonian Singularity (#1619)
# Description
By request from the very same person who assisted with
https://github.com/Simple-Station/Einstein-Engines/pull/1618
This PR ports(and fixes)
https://github.com/space-wizards/space-station-14/pull/23372 such that
it works on modern Robust Toolbox.
This PR essentially makes it so that the Singularity (And Tesla by
extension) inherit some of the momentum of objects thrown into them. Im
practice it means that they now work more like they do in SS13, whereby
if a traitor does not actively intervene in a Singuloose(such as by
using a Singularity Beacon), the singularity will usually be "Blown back
into space" by space wind throwing objects at it in retaliation to it
eating engineering.
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/04e9e5b9-d873-4425-b19a-b854b57db486
</p>
</details>
# Changelog
:cl:
- add: Singularity and Tesla are now affected by objects thrown into
them, causing them to change directions. Unless a traitor intervenes
(with a Singularity Beacon), a "Singuloose" is extremely likely to be
blown out to space.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
* Automatic Changelog Update (#1619)
* Yet Another "OnPlayerSpawn" Crash Fix Attempt (#1621)
There absolutely should not be something deleting the player characters
when starting a round.
---------
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
* Use System (#1622)
yes this is a system
i dont know why it's not better named
* Kill Mana (#1623)
it is genuinely so bad
:cl:
- remove: Remove mana.
* Automatic Changelog Update (#1623)
* Only Use Roundstart Species for RandomHumanoid (#1624)
it will no longer choose vox or lamia.
* Update MacOS Logo (#1625)
# Description
Updated the MacOS logo to the EE one.
Also, the base logo was 256x258, which caused me physical distress, so I
fixed that too.
# Changelog
None
* Revert "Update MacOS Logo (#1625)" (#1628)
This reverts commit 881ae3be0ad5e0c8f1311738b12ebd1e142f4c82.
not a valid png
* Gladiabot (#1548)
Co-authored-by: stellar-novas <stellar_novas@riseup.net>
Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>
* Automatic Changelog Update (#1548)
* Update MacOS Logo (#1629)
This is the same as #1625, but it doesn't use symlinks, which are broken
on Windows.
# Changelog
None
* Loadouts Item Failed to Spawn Check (#1630)
* Harpy Displacement Map (#1633)
# Description
Adds a displacement map for Harpies so that they can now wear pants.
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
:cl:
- add: Harpies can now wear pants, and have a displacement map to make
them look less terrible when doing so.
* Automatic Changelog Update (#1633)
* Engine Update v240.1.3 (#1634)
* v240.1.2 (#1636)
accidentally used sourcegen
* Hotfix AI Being Eaten by Singulo (#1637)
ports #31556
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
* Goob Mechs (#1611)
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
We like mechs here, yeah?
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl: Mocho, John Space
- tweak: The H.O.N.K. has received an airtight cabin for honk operations
in outer space.
- add: Added the Ripley MK-II, a heavy, slow all-purpose mech, featuring
a pressurized cabin for space operations.
- add: Added the Clarke, A fast moving mech for space travel, with built
in thrusters (not certain if they work properly though :trollface:)
- add: Added the Gygax, a lightly armored and highly mobile mech with
enough force to rip walls, or someone's head off.
- add: Added the Durand, a slow but beefy combat suit that you dont want
to fight in close quarters.
- add: Added the Marauder, a specialized mech issued to ERT operatives.
- add: Added the Seraph, a specialized combat suit issued to ???
operatives.
- add: The syndicate has started issuing units under the codenames "Dark
Gygax" and "Mauler" to syndicate agents at an introductory price.
- add: The exosuit fabricator can now be emagged to reveal new recipes.
- add: There are 4 new bounties cargo can fulfill for mechs. Feedback on
the cost/reward is welcome!
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: John Space <bigdumb421@gmail.com>
Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
Co-authored-by: ScyronX <166930367+ScyronX@users.noreply.github.com>
* Automatic Changelog Update (#1611)
* Fix Gun Contests (#1638)
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Fix RoundLevel Test Fail (#1635)
* Player Customization (#1626)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Adds cosmetic pronouns, visible through examining people (if they have
any) as a PushMarkup.
Adds Station AI/borg name customization.
CCVars:
customize.allow_cosmetic_pronouns (default false)
customize.allow_custom_station_ai_name (default false)
customize.allow_custom_cyborg_name (default false, for borgs, mediborgs,
etc)
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- add: Added cosmetic pronouns. (disabled by default)
- add: Added Station AI name customization through character
customization. (disabled by default)
- add: Added Cyborg name customization through character customization.
(disabled by default)
* Remove Gamerule Count Test (#1639)
* Automatic Changelog Update (#1626)
* Adds Veterancy Weapons to Sec, Removes Ion (Broken), Fixes Cutlass Sp… (#1599)
# Description
Adds some more expensive weapons to security which eat up more value.
idea from [goob
MRP](https://discord.com/channels/1323488536501944350/1330495398137298975)
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- add: Added 2 new security loadout items
- tweak: Tweaked BSO's ammo
- fix: Fixed energy cutlass sprite
- remove: Removed broken Ion component
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1599)
* Box Station For EE (#1615)
# Description
Howdy, y'all, I apologize for the delay, but I've finally completed the
Box Station for EE. I've added a few things, including the supermatter
crystal (SM) with the thermal-electric generator (TEG) near the Atmos
Department TEG-KIT. I've also added all the job spawn points that were
available for now: NanotrasenRepresentative, BlueshieldOfficer,
Magistrate, AdministrativeAssistant, SeniorEngineer, SeniorPhysician,
SeniorResearcher, SeniorOfficer, MailCarrier, ForensicMantis,
Roboticist, MailCarrier, Reporter, StationAI, and MedicalBorg. Finally,
I added holopads in all departments with AI upload (all law circuit
boards).
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl: Mike32oz
- add: Box Station, supermatter crystal, holopads, and Thermal-electric
generator.
- tweak: Box Station, Engineer, Medical, Epistemics, Cargo, Security,
and Service Departments.
- remove: Box Station, Particle Accelerator Room in Engineer
Departments.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: stellar-novas <stellar_novas@riseup.net>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1615)
* Add MathNet.Numerics To The Project (#1641)
# Description
The documentation for it can be found here:
https://numerics.mathdotnet.com/api/MathNet.Numerics/index.htm
This adds an entire massive library of academic/scientific/engineering
math functions.
I basically need this going forwards to start comprehensively fixing
this game's terrible math.
# Changelog
Not player facing, but it deserves to be here:
:cl:
- add: (For Developers): Added the MathNet.Numerics library. It contains
a great number of scientific and engineering math related functions. For
more information, its documentation can be found here,
https://numerics.mathdotnet.com/api/MathNet.Numerics/index.htm
* Automatic Changelog Update (#1641)
* Update SupermatterSystem.Processing.cs (#1642)
# Description
Mirror of a bugfix from
https://github.com/Goob-Station/Goob-Station/pull/1469
* MathNet.Numerics Apparently Needed To Be In Server And Client Too (#1643)
Whoops. To be fair it's my first time adding something like this to a
project. :)
* Better Progress Bar (#1648)
# Description
DoAfter progress bar like in ss13 forks.
---
---
# Changelog
Fuck it, no need this, im not a contributor.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Removes Asphyxiation From Lamia in Favor of Pierce/Poison (#1645)
# Description
The asphyxiation damage was extremely temporary and it took less than a
cycle to get it healed up. In the current stage where you can't strangle
someone, this kind of damage is irrelevant.
Thus I have moved the 2 points of asphyx equaly to piercing and poison
instead, making the lamia melee feel a bit stronger.
---
# Changelog
:cl:
- tweak: Tweaked lamia bite
* Automatic Changelog Update (#1645)
* Change Time Requirements for Command Positions & Mystagogue (#1649)
# Description
Normalizes the time requirements for some of the command positions,
specifically the `Logistics Officer`, `Chief Engineer`, `Chief Medical
Officer`, and `Mystagogue`.
The Logistics Officer has too much overall time requirement. 40 hours
compared to other positions that only have 30 and 25? Lowered it.
The Chief Engineer and CMO have their times raised since Chief Engineer
should know more and CMO now has Surgery that they should know and be
familiar with as well.
The Mystagogue should have a slightly higher time requirement with
Psionics and should also be required to be a Mantis and Cataloguer for a
minimum of 5 hours so they know how their innate abilities and how to
deal with Psionics.
---
# Changelog
:cl:
- tweak: Logistics Officer now has 30 hours instead of 40 hours of time
requirement overall.
- tweak: Chief Engineer and CMO have 25 hours instead of 30 hours of
time requirement.
- tweak: Mystagogue now has 5 hours of time requirement as Mantis and
Cataloguer.
* Automatic Changelog Update (#1649)
* HideSpawnMenu Harpy Dummy (#1651)
fuc u tcj
---------
Signed-off-by: Aiden <aiden@djkraz.com>
* Port Stunbot and Disablerbot From Floofstation PR (#1631)
Taken from: https://github.com/Fansana/floofstation1/pull/501
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Adds the Batonbot and the Disablerbot. Both of these will idle around
until they encounter hostile wildlife, such as angry slimes, and will
then liberally apply their respective weapon until the threat is no
more.
The Batonbot has a weakened version of the Baton, applying 15 less
Stamins damage and only 4 burn damage
The Disablerbot uses the SMG Disabler bullet with a significant spread
at a fire rate of 1
This means that both of them are less powerful than a normal baton or
disabler.
They are built with:
- Proximity Sensor
- Security Helmet
- Stunbaton/Disabler
As such requiring co-operation from Security to construct.
Also included are Spawners, for if we want them on stations on
round-start.
The recipes necessitated a few new tags, which have been marked with #
Floofstation, along with the reason they were added to the entities.
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/8e6c9861-004c-4138-abcc-f0fe203ed9d0
https://github.com/user-attachments/assets/7c7cd08d-3c8e-4896-8f25-ce8cd5a4fb0e
</p>
</details>
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl: Timfa
- add: Add Batonbot
- add: Add Disablerbot
---------
Co-authored-by: stellar-novas <stellar_novas@riseup.net>
* Automatic Changelog Update (#1631)
* MODsuits (Port From Goob #1242) (#1640)
# Description
Ports MODsuits from Goobstation PR
https://github.com/Goob-Station/Goob-Station/pull/1242. The PR author
has confirmed that he is okay with me doing this.
---
# TODO
- [X] Port in sprites
- [x] Port in YMLs
- [X] Port code
- [x] Port code PATCHES
- [x] Update EE with required fixes
---
<details><summary><h1>Media</h1></summary>
<p>
## Modsuit crafting
https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68
## Modsuit sealing
https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134
</p>
</details>
---
# Changelog
:cl:
- add: Modsuits have been ported from Goobstation!
---------
Signed-off-by: Eris <erisfiregamer1@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1640)
* ChemMaster Improvements (#1650)
Hate having to use the same buffer for pills? Want sorting and container
solutions for output? No need to wait _any_ longer! A brand new pill
buffer, a sort feature _for_ the new pill buffer **and** you have your
amount buttons back!
Showcase:
https://ptb.discord.com/channels/1218698320155906090/1218698321053356060/1332224976803074123
:cl:
- add: A new ChemMaster experience has been granted to the people of
Einstein Engines. Includes a pill buffer!
* Automatic Changelog Update (#1650)
* Hardsuits Fire Protection (#1445)
# Description
I have incredibly vivid memories from SS13 over a decade ago. In
particular, every time the Supermatter delaminated, one of the Engineers
would inevitably end up heroically sacrificing themself by walking
directly into the supermatter core in order to drag the crystal to
space. This was made only possible because the engineering suits made
you immune to fire damage. It's currently not possible for engineers to
do this, since fire damage is ABSURD, and having an 80% reduction to 400
damage per second is still death in less than 3 seconds.
So this PR corrects the injustice. Now the chief engineer gets to
heroically sacrifice himself by dragging the supermatter crystal out to
space.
# Changelog
:cl:
- add: Engineering Hardsuits, Maxim Hardsuit, and Cybersun's Elite
Tacsuit now all make the wearer immune to atmos fires. Have fun walking
directly into the supermatter engine. Play out your heroic engineer
fantasy by dragging the supermatter crystal to space in order to save
the station.
---------
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
* Automatic Changelog Update (#1445)
* [Port] Playing Cards (#1451)
# Description
This ports Playing Cards from:
Estacao Pirata...
Frontier...
and GoobStation...
More specifically, ports
https://github.com/Goob-Station/Goob-Station/pull/1215 and
https://github.com/Goob-Station/Goob-Station/pull/1311 sequentially.
In short...
- Adds 3 skins of the playing cards: Nanotrasen, Syndicate, and Black.
- NT can be obtained as an item in your loadout but is locked behind a
command job.
- Syndicate can be obtained as a pointless item in the uplink for 1 TC.
- Black can be obtained both as an item in your loadout and from the
Games Vendor.
---
# TODO before review
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [X] De-namespace all of (_)EstacaoPirata? (not required, it is an EE
fork)
- [X] **_TO MAINTAINERS/CONTRIBS, NEED YOUR INPUT!!!_**: See
`Content.Client/Inventory/StrippableBoundUserInterface.cs:220`'s "DRAFT
TODO". Basically its me asking how to involve the thieving trait in the
omission of the playing cards in the strip menu. Currently, it does not
take into account the trait and simply obscures. (prolly dont take the
trait into account, obscure regardless)
- [X] Figure out what to do with the Nanotrasen deck variant: should it
remain free like the black deck or restricted like the syndicate? Locked
behind any command job? (prolly this)
- [X] Get media actually filled in
---
<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->
<details><summary><h1>Media</h1></summary>
<p>
</p>
</details>
---
# Changelog
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
:cl:
- add: Playing Cards. You may get one in the Games Vendor or as an item
in your loadout.
---------
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1451)
* Try Fix Loadouts, Again (#1652)
more than likely this is just because of invalid loadouts
* Chitinid (From Delta-V) (#1644)
port https://github.com/DeltaV-Station/Delta-v/pull/2707 (with
permission)
:cl: ElusiveCoin
- add: Added a new species, the Chitinid.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: ElusiveCoin <elusivecoin@gmail.com>
Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1644)
* Change "Kill" To "Teach a Lesson" (#1654)
better for MRP
this code is originally by me anyway, they just made it better
:cl:
- tweak: Kill random person objective has been replaced by teaching them
a lesson, removing the need to RR a random person.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
* Automatic Changelog Update (#1654)
* Fix Melee Attack Speed Again (#1653)
# Description
Melee Weapons were accidentally given the wrong attack speed formula
again. It took me awhile of reviewing the entire history, but eventually
I found the line where the wizmerge introduced a new check that used the
old formula.
Also to help prevent this from happenin…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
This PR heavily reworks and increases the functionality of the current map editor.
what's changed:
Why / Balance
The current map editor sucks.
Technical details
Media
editor2.mp4
Requirements
Changelog
no 🆑