Fixes a major mapping error introduced in #39816 and adds handling to the map merger to prevent it from happening again.
Keys need to be ordered movables, then turf(s), then area, otherwise our map reader acts weird. In-game this manifests as floor being placed in the dirt's underlays, such that after floor is crowbarred to plating the floor is still visually present (this is how I noticed the problem).
Fixes#39888.
Some map files still have stacked turfs. Our map reader supports this but it tends to cause other problems (e.g. atmos) so I'll try to look at those in the future.
X=$(find _maps -name '*.dmm'); tools/hooks/python.sh -m convert $X
I added an examine message to the ore silo:
[src] can be linked to techfabs, circuit printers and protolathes with a
multitool.
Also added it to runtimestation, which required me to expand the area a little.
* Adds programmable nanites to robotics
* Oh yeah i might want to actually PR the files
* nanite injectors, nanite printer, nanite analyzer
* We're back
* remove some reagent stuff
* more removal
* those too
* cool icons!
* might pass travis now
* lotsa code
* tgui fixes/misc fixes
* WE'RE FUNCTIONAL BOYS
* some ui stuff
* Misc fixes, cloud update, access nanites
* activation check
* stuff
* preparing for new chamber sprite
* Physical backups, sensor nanite programs
* techweb sensor nanites
* fix
* include
* fix again
* revert
* blinding nanites
* minor change
* minor tweaks
* makes minor shocks interfere with nanites
* fix
* split trigger file into the others, for consistency
* cleanup, added mindshield nanites to techwebs
* include n all
* how'd that even happen
* Fixed HUD, readded missing remote icon, added nanite scanner, health analyzers can now detect nanites, added stealth program
* cost tweaks
* better term
* new icon! by MrDoomBringer
* icons/tweaks
* tgui build
* boards
* fix
* fixes implants not updating mindshield status
* move implant hud to living
* new remote sprite
* scanner sprite
* biotype checks
* some nerfs
* new open chamber sprite
* Fixes mindshield implants not updating the HUD, fixes uninstalling always removing the first program, adds 25% and 75% health sensors
* correction
* nerfs antistun nanites
* fixes scanners and minor tweaks
* fixes revs with mindshield
* oh yeah haha
* Fixes wonky techweb
* Moves pyro program to weapon node
* Adds defib program and some investigate logging
* mistype
* fix
* fix2
* save your files before committing
* emps can desync from cloud
* pretty outdated
* Cloud backups are now tied to the cloud consoles; you can no longer build a new console to access existing backups.
* UI fix
* more fix
* okay fix for real
* tested and working
* Extra Settings rework, sensor nanites vastly better
* non-unique glitches
* Public chamber, extra settings rework, new sensors, speech program
* Mute and mind control nanites
* mind control into hazard
* better description
* fixes
* fixes relay nanites
* fixes TK access
* mind control costs less
* UI update
* removed pointless code bit
* tgui build
* compiles
* dammit
* paralysis keeps victim upright
* Adds sounds to consoles
* some feedback for some subtle effects
* new chem lore
* Viral nanite customization
* fix
* tgui build
* Added mitosis nanites
* removes glitched nanites from techwebs
* Added flesh eating nanites, poison nanites, hallucination nanites
* ,
* #traviscoding
* Adds memory leak, renames nanite roam node to nanite smart
* Voice sensor + some techweb desc tweaks
* hallucination and Hear() fix
* changes signal registering to the new method
* 75% done, i think
* should be all
* more fix
* more changes
* okay should be fine now
* ninja
* inheritance
* i don't care about originality!
* line endings
* line endings 2
* maybe
* fixes program installation
* new review
* line endings?
* line endings??
* line endings???
* wait do i even use this
* fixes public nanite chamber cloud id
* maint overlay for chambers
* args doesn't work well here
* antiabuse checks
* compile tho
* fixes locked remotes
* disk renaming
* skull echo nanites
* self scan program
* Condenses a lot of sensors into a few generic but customizable versions
* fixes machinery runtimes. Hacky, but a proper fix would likely require a refactor of machinery typing.
* forgot to save
* empty
* metastation nanite lab
* Removes duplicate APC
* fix for nanite chamber
* Raise max programs
* UI Tweaks, aggr. replication rebalance, minor fixes
* let's not do that again
* Fixes nanites meta merge conflict
* Merge conflict v2
* fuck this HDD is slow
* What the fuck did you just fucking say about me, you little leaf? I'll have you know I graduated top of my class in the Lawyer School, and I've been involved in numerous secret DMCA raids. I am trained in law violations warfare and you are nothing to me but just another target. I will wipe you the fuck out with precision the likes of which has never been seen before on BYOND, mark my fucking words. You think you can get away with changing the code? Think again, fucker. As we speak I am contacting my secret network of attorneys in the Fox and your IP is being traced right now so you better prepare for an outstanding warrant, maggot. The storm that wipes out the pathetic little thing you call your leaked code. You're fucking done, kid. I can file for an injunction anywhere, anytime, and I can take legal actions in over seven hundred ways, and that's just with my bare hands. Not only am I extensively trained in unarmed combat, but I have access to the entire arsenal of the Florida Statute and I will use it to its full extent to wipe your miserable ass off the face of Canada, you little shit. If only you could have known what unholy retribution your little "clever" action was about to bring down upon you, maybe you would have held your fucking tongue. But you couldn't, you didn't, and now you're paying the price, you goddamn idiot. I will send you to spend time in a Florida State Penitentiary if you ever decide to travel from Canada to the U.S. You're fucking done, kiddo.
* Adds virus symptoms that interact with nanites
* Fixes spreading nanites being more infective the more protection the victims have
* Review plus public chamber tweak
* . = ..()
* ball
* cloud
* . = ..()
* always press save all before committing
* missed a couple
New titanium floors! The intent here was to reduce the eye strain that the current max saturation fuckbois have, and make some floor tiles people might actually consider using. Right now the options are still pretty limited with blue, yellow etc only coming in full tiles, and I expect this will remain so until an actual greyscale rework comes along that shrinks the file size down from its bloated 4,000 sprites to something more reasonable and modular. Decals, perhaps?
* Code to doors.dm for airlocks with unrestricted sides
* Code to airlock_electronics.dm supporting airlocks with unrestricted sides
* Code to door_assembly.dm supporting airlocks with unrestricted sides
* Adding buttons to airlock electronic gui for unrestricted direction access
* Update airlock_electronics.dm
typos in comments are still typos
* Tgui support for arbitrary unrestricted access
* Cleaner way of calling unrestricted_sides()
Moved the call to unrestricted_sides() to run from allowed(), and added a recursive check for if the user is inside an object (like a mech).
* Missed a test variable
* Replaced a block of if statements with get_dir
Re: SpaceManiac
* Simplified XOR operation
Re: SpaceManiac
* Changes order from NESW to NSEW (for get_dir)
Re: SpaceManiac
* Re-built using changes to airlock_electronics.ract
* Added unres overlays, fixes overlay/power actions
Small lights that shine out to indicate open directions. They're not super pretty, but they aren't *that* horrible I think.
Because it's a light, it acts as a weak light source.
Also, all door overlays respond to power changes now, including area power loss. There was code in the overlay section for checking power states, but nothing to actually trigger it outside players opening the panel or something. This was broken before I made any changes.
* Makes overlays respond to power outages
The airlock overlay (bolt lights, etc) would not respond to the area power going out or coming back, even though it had code for it. This was broken before I added my code.
* Makes the Airlock update overlays when built
Long story short, the unres_sides variable wasn't getting set before the airlock spawned and did its first overlay update, meaning the unres indicators would be invisible until the door's state changed the first time. This makes the airlock run the update again just before the construction airlock object is removed.
* overlays.dmi -- removing to replace
I can't just edit the code of an image file, can I?
* new overlay file with the four unres indicators
* Set medical doors to use this feature
Removed medical door buttons, and set the unres variable on Meta, Box, Delta, Pubby, and Omega.
* Revert "Set medical doors to use this feature"
This reverts commit 53122ce63240ff0660226c8d2c6ed7eb814ec054.
* Updates medi-doors in maps
let's try this again...
* Did this tgui.js get overwritten?
juggling too many testing build folders is hard
* reverting momentarily
* Re-adding tgui.js changes
* pushing tgui.css too
Didn't realize this file also got changed by the script
* rebuilt the tgui.js file
* repushing the unchanged tgui.js again
I hope I'm not email-spamming people with this
* .css too
* Re-applying tgui.js changes
* added mapping helpers
little green arrows that set unres settings on airlocks and then poof
* removal of comments
unneeded code
* Adding helpers to all maps
Removed the var edit, as well
* Changed airlock.dm to use defines
Also removed an unneeded "src" from four lines.
* New .js and .css file to fix RPD issue
Boy I love tgui
* Removing define defines
Didn't know these were coded elsewhere. Neat.
* Mapmerged again, as requested
* Clean up maps
The CentCom recovery shuttle (where escape pods dock) is so close to the space
ninja prison that players can see indestructible wooden walls from it.
I moved it a little further south, so it's not as immersion breaking.
I added /wiki manuals for the following:
- Tcomms
- Atmos
- Circuitry
- Toxins
- Medicine/Medbay
- Surgery
- DIY grenades
- Food
Should give new players an easier time since they won't have to tab out to a
browser and search the wiki.
These, like in the other ships, are pretty weak (meta still has the strongest
monsters, but it's also the most well stocked ship). These zombies have no
infection chance, 60 hp instead of 100, and do 11 damage instead of 21 (could
be raised to 15, if you guys want). And like the other ships there are 4
monsters on it.
Circuitry lab is no longer isolated from the rest of science, being moved to
the RnD section;
Because circuitry was too isolated and actually felt out of place.
There is now a firing range;
Because without the circuity lab there was extra space and as Box didn't
have a firing range in science so I added it.
Atmos machinery moved to the place that uses atmos machinery (toxins);
Because everytime you'd like to mess with toxins using machinery you'd have
to grab the cannister of gas mix at temperatures hotter than the surface of
the sun and take it to the area that was supposed to be used for testing
guns and other non bomb things. Like in real life, dangerous things are
supposed to be contained in the dangerous area so that damage can be
minimized. And like in real life, things should be near the places that
require such things to be used.
Experimentator is a little less isolated as now it's more like a part of the
RnD section.
It was my first ship where I started to delve into shuttle atmos and power and
it really, really showed.
...So this one's a lot less shit!
RIP prolapsed anus fuckin' turbine coming out the back, wasted space, and
fucking atmosia(??) room that had no place on a pirate event ship.
Armory equipment is unchanged. Turrets are syndicate laser type (on pirate
faction). They do less damage, but have the option to stun and there are two
that cover the front as well, now, should hopefully feel about the same in
terms of protection.
Added a med wall vendor to the armory.
* Omega atmos lockdown button no longer has bar access reqs
* Pubby disposals conveyors now have the correct dirs
* Pubby's service techfab is no longer inside a wall
* Pubby's disposals loop is no longer cut off near the RD office
* Lavaland seed vault chem dispenser now initializes with upgraded parts, since
those planty bastards are stuck in there and can't even upgrade/charge it etc
* Meta's SME cooling loop now has grilles that partially cover it. Nothing that
will stop a meteorite, but probably the odd space dust
I really like the Syndie lavaland base since it allows you to test deadly chem
mixes with impunity (read: without getting banned or having to set up a local
server). I have tweaked a few areas to let players experiment even further:
Chemistry related changes:
* Made the testing chamber airlock heatproof and added scrubbers/vents to
restore air after you've ignited the latest burnmix.
* Replaced loose grenade casings/assemblies with a vending machine inside
Chemistry.
* The vending machine contains casings, assemblies and one holy water bottle
for strange reagent/life reactions. If syndies are clinically bored, they can
use it to set up a monster shooting gallery as well.
* Chemical/soda/beer dispensers start emagged. This both allows syndies to
experiment with more chemicals and gives miners an incentive to come inside.
Non deconstructable, meaning you can't unwrench it.
* Added a smoke machine board to the warehouse, as well as more stock parts to
let players build more machinery and beakers for grenades.
Other changes:
* I added a cabinet with syndicate documents to the vault - this is valid for a
10.000 credit bounty at cargo.
* Replaced incinerator machinery with the proper "sydicatelava" subtypes; added
a DP vent and controller to the incinerator airlock.
* Set waste outlet volume_rate to 200 so that the chem test chamber can vent
gases quickly.
Now that shuttles are all loaded via template we no longer have a need for the
timid var on shuttles.
Well not all shuttles, it seems I forgot to template the backup shuttle so it
wouldn't have been working until now. This got fixed here as well.
done as per player request, complaint was that it was inefficient unless you
steal the mixer off of the ships distro, this keeps the ship theme of
"outdated" while allowing players to make the improvement they want without
dismantling distro.
Adds a gun recharger to the bridge and a few more windows. Originally this PR
was going to make it significantly more luxurious, but I didn't like how any of
it was turning out. So I opted to downgrade it to simply an NT frigate.
Slightly above standard than a regular ol' frigate but not by much. This ship
just isn't built for luxury.
round start atmos issues occured in: sci maint, Tcomms transit pipe room,
xenobio disposal in space
i'm not sure if the sci maint initial gas mix is intentional or not because it
had the var edited instead of an accidental use of /turf/open/floor/plating/-
airless but it causes a warning so i removed it
Main goal: clean up atmos so it is more user friendly and up to date with its current uses
Side goal: provide the backbone of making tritium for the user while still requiring several edits to make it at a rate that can be used.
Reasoning: atmos can take a lot of math and a lot of trivial work to make it reach its end teir developements, so much so that many, especially newer atmos techs arent able to make anything tangible until around the 30 minute mark which is the length of most rounds that arent on low pop hours. When it comes to more advanced incinerators users the filter, scrubber, and mixer are all mandatory changes for a tritium set up which can become very boring and just function as a time gate between the start of the round and tritium to work with. These changes are meant to remove the less thought requiring parts of incinerator changes and encourage newer players to make their first exotic gas (similiar to how each department has a simple entry level job that a player can get hooked on to start). The changing in scrubbers and distro are meant to allow players to make many common changes without removing parts the scrubbers and distro from the room itself and the removing of the old piping for the same reason. Removing the old piping will also allow the room to be less cluttered after the incinerator user makes his or her changes. Toxins incinerator was also updated for universality
Adds a slight positive moodlet for working out, the same effect as reading a book
In the process refactors weight machines so they are actually object oriented, this creates map edits to Delta and Pubby as well as one ruin
Changes the message "Nothing special has happened to me" to something that is hopefully less immersion-demolishing.
Moodlet text for eating disgusting food no longer appears in positive green text
Other various grammar fixes
Redesigned the white ship for metastation, this one's a salvage/cargo vessel!
The salvage pod is currently missing, however, as it doesn't work right now.
I'll add it further down the line. This ship is also filled with a few syndies
protecting it, one of them is ranged, the others are unarmed melee.
Metastation: Spruced up the RnD circuitry lab; no gameplay changes.
Due to exemplary performance, Nanotrasen has awarded Shaft Miners with their
very own bathroom, constructed at the mining station dormitories. Construction
costs will be deducted from their salaries.