mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-27 17:41:50 +00:00
e8e6ee4e2bbdc3c659a0b884b53b1861ba5ccab1
631 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Cyprex
|
e6bb4098c4 | Revert "Merge upstream" | ||
Paxilmaniac
|
3fb3c7add2 |
Gun code override unshittening part like, two by this point (#18957)
* this code is so fucking funny it makes me want to merge w/o looking * safety component stuff * safeties should be finished * I loooove safety component * I swear that's all for gun safety * manufacturer component * cant forget this * this is so awful * 1100 line long gun file * ok it actually compiles now * that should not be an addition of any sort * these defines should not be used anymore * why?? the fuck??? are there var edited fire modes on black mesa????? * how did that even happen * maybe ci will shut up now * oh man so many guns are lacking autofire now * probably fixes safety toggling * that should reference the gun not the component * that should probably return * makes it replicate current behavior, defaults safeties to being ON * and that is all i have to say about that * its automagically |
||
SkyratBot
|
a076937e6d |
[MIRROR] Anchors incorrectly unanchored reinforced plasmaglass windows on snowdin. [MDB IGNORE] (#19522)
* Anchors incorrectly unanchored reinforced plasmaglass windows on snowdin. (#73607) ## About The Pull Request Every single south facing reinforced plasma-glass window on snowdin was unanchored, I've changed them to the anchored version. ## Why It's Good For The Game Bug fix! ## Changelog 🆑 fix: The unanchored reinforced plasma-glass windows on snowdin have been anchored. /🆑 * Anchors incorrectly unanchored reinforced plasmaglass windows on snowdin. --------- Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com> |
||
|
SkyratBot
|
19608fbac6 |
[MIRROR] Barsign UI/UX Improvements - Emissive effects, balloon alerts, and refactored code [MDB IGNORE] (#19121)
* Barsign UI/UX Improvements - Emissive effects, balloon alerts, and refactored code (#73106) The barsign code is over a decade old so this is a big refactor with some notable improvements: - Emissive effects (neon lights now glow in the dark) - Balloon alerts instead of `to_chat` messages - Mapping helpers based on direction and all_access - Barsigns are considered machinery now and use power * Barsign UI/UX Improvements - Emissive effects, balloon alerts, and refactored code * fixes modular maps --------- Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> |
||
|
Paxilmaniac
|
e868fb24ad |
Slightly less important map reset of everything not in the map_files folder (so ruins, gateways, shuttles, and so on) (#19062)
you got it |
||
lessthanthree
|
8198e578ca |
[MANUAL MIRROR] Fix a merge skew on armor datums (#19212)
* Fix a merge skew on armor datums (#72909) And also add a check grep to find it in the future * fix linters * damn youuuu --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> |
||
|
SkyratBot
|
406b6870bd |
[MIRROR] adds atmospheric gloves, small resprite of firefighter gear, repaths stupid glove paths [MDB IGNORE] (#18785)
* adds atmospheric gloves, small resprite of firefighter gear, repaths stupid glove paths (#72736) repaths a lot of gloves off /color because they were incredibly stupid firefighter gear has gotten an update (it doesnt cover hands anymore though, you need something else) firefighter helmets no longer hide your mask or glasses  fixed engine goggles starting with darkness vision to the atmos lockers adds atmospheric gloves, a pair of thick (chunky fingers) gloves that are fireproof and fire protective, slightly shock resistant and let you fireman carry people faster. atmospheric firefighter helmets now are a subtype of welding hardhats, you can enable a welding visor. welding hardhats change mode with right click instead of altclick im not a good spriter but i think this resprite makes them fit nicer with other engi equipment lets me firefighter rp 🆑 add: Atmospheric Gloves, thick gloves that are fully fireproof and fire protective and let you fireman carry people faster. fix: fixes engine goggles starting with darkness vision qol: firefighter helmets can now enable a welding visor qol: welding hardhats change mode with right click instead of altclick balance: firesuits no longer protect your hands /🆑 * Makes shit compile * Updates the digi and snouted stuff to match the new sprites (thanks Halcyon!) * Fixes a whole ton more issues that popped up --------- Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> |
||
Tastyfish
|
47d25b51c4 |
[MISSED MIRROR] Replace nearly every map grep with a YML file that actually respects structure, and fixes the massive amount of failures that were never caught (#72372) (#18664)
* Replace nearly every map grep with a YML file that actually respects structure, and fixes the massive amount of failures that were never caught (#72372) [Documentation here](https://github.com/Mothblocks/tgstation/blob/maplint/tools/maplint/README.md) We should not be using greps to the capacity that we currently are. If you are not smarter than a parser, then you should not try to beat one. DMM files should NOT be treated as text files that can be parsed with any old Unix tool. They are a structured language. Because of our abuse of greps, check_greps is full of hard to read, hard to maintain checks that do not consistently work, because they all make very specific assumptions about how TGM works, which are provably untrue. This format is mostly straightforward for the lints people write, and easily extensible to the ones people will want to write. 🆑 fix: Fixes a bunch of cases of windows not being where they were supposed to be, tables/chairs stacking on each other, and other very small stuff you've never noticed before. /🆑 * pointless line change * desync * bye Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> |
||
|
SkyratBot
|
18dc1abc43 |
[MIRROR] Refactor lighting items that use fuel [MDB IGNORE] (#18545)
* Refactor lighting items that use fuel (#72146) Fixes #71826 This does the following: - Makes candles a subtype of flare - Fixes candles having lighting inconsistencies - Fixes burning items (welder, candles, flares, etc.) not causing ignition effects when held in hand - Adds burnt flares and melted candles to maint loot and trash spawners - Add match lighting sound when candles are lit - Add time defines for fuel amounts and rounded them (ex. instead of 32.3333 minutes, it's now 35 minutes) - Light sources that burn will now spawn a trash item once fuel is spent - Light sources that burn now have a welder hitsound - Light sources that burn can now be extinguished by a fire extinguisher (except flares) - Light sources that burn can now be used to ignite another object on fire (ex. a lit candle can be used to light a cigarette) - Light sources that burn and are lit now do `BURN` damage while attacking Code is more cleaner and consistent. Also fixes some bugs. 🆑 soundadd: Candles will now use the match lighting sound when lit soundadd: Light sources that burn will now have a welding hitsound fix: Fix candle light behaving erratically fix: Fix burning items that are held in hand will now have an ignition effect on the turf. (ex. lit welders in hand will now ignite plasma in the air) balance: Light sources that burn and are lit now do `BURN` damage while attacking balance: Light sources fuel amounts were rounded to exact numbers (ex. instead of 32.3333 minutes, it's now 35 minutes) qol: Light items that burn can now be extinguished by a fire extinguisher (except flares), used to ignite another object on fire, and will now leave a trash item once fuel is used qol: Add burnt flares and melted candles to trash spawners refactor: Refactor lighting items that use fuel to be more robust /🆑 Co-authored-by: Kylerace <kylerlumpkin1@gmail.com> * Modular! * Toggle Light Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: Kylerace <kylerlumpkin1@gmail.com> Co-authored-by: Funce <funce.973@gmail.com> |
||
|
SkyratBot
|
5a18ff0bbb |
[MIRROR] Completely Culls req_access_txt/req_one_access_txt [MDB IGNORE] (#18458)
* Completely Culls req_access_txt/req_one_access_txt (#72281) Hey there, Now that every instance of `req_access` and `req_one_access` is a list of strings, there is absolutely no reason for req_access_txt/req_access_one_txt to exist. In fact, any instance where they were still used in the codebase was very convoluted and was very broken! Don't worry, I fixed it all out, and life is good. I also dmdoc the surviving access variables, because those were missing. I went on the side of caution and made a more verbose documentation with an example just to have people really grasp this (it took me a while to actually get it) I believe that we changed _everything_ over to the req_access/req_one_access system earlier this year in VV, but the problem is that _new mappers don't understand the difference between the two systems_. In fact, the "txt" system is completely redundant since all it does is transition stuff to the "base" system. So, let's just completely cull the one that's all but deprecated and ensure this confusion no longer arises. The whole purpose of "txt" seemed to be to convert the access, but it's all pointless now that we can just read the list directly. I'm also 99% certain that the "access check" on vending machines broke (and didn't seem to have correct logic in the first place? I legitimately couldn't find a case where it could fail in testing, so I changed that up), and that's fixed up now. Let me know if I was clueless there. I know it's short-circuiting now as opposed to "all must be true", but it just didn't work. * Completely Culls req_access_txt/req_one_access_txt * oh the misery * makes them use the thing that actually works * test to see if engineering access is breaking it * Revert "test to see if engineering access is breaking it" This reverts commit 3cc2c554ff18f435a51601782e64c76193298db7. * Fix access checks when req_access is null (#72458) ## About The Pull Request Fixes #72450 - This seems to be an oversight in some of the access refactors we've been through recently. When there was an assumption in `check_access_list()` that `req_access` would always be a list, and that if it was not something terrible had gone wrong and the door should default to public access. With the cleanup of the _txt access vars and the introduction of mapping access helpers, this assumption is no longer true. `req_access` will be null when multiple helpers are painted onto the same door, so we need to handle that properly. Thanks to @MrMelbert for spitting out the attached fix in mapping general and letting me PR it after testing. This really needs a suite of unit tests around it. San has helpfully volunteered to work on that for three hours before getting frustrated. ## Why It's Good For The Game No more public access to engineering lobby, lathe, etc. ## Changelog 🆑 Vire, MrMelbert fix: The engineering lobby and lathe are no longer public access fix: Doors will no longer be treated as public access when they have multiple accesses set on them /🆑 Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
7ee524f748 |
[MIRROR] Basic Mob Carp Part VIII: Basic Mob Carp [MDB IGNORE] (#18344)
* Basic Mob Carp Part VIII: Basic Mob Carp * maps * missed killing main carp file * shorki and ocean biomes * shorki 2: pet-a-boogaloo Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
ee8226b8a8 |
[MIRROR] Fixes prefilled drinking glasses, and small carton icon [MDB IGNORE] (#18606)
* Fixes prefilled drinking glasses, and small carton icon (#72527) Fixes a few drink container issues: - The `/obj/item/reagent_containers/cup/glass/drinkingglass/filled` subtypes runtimed whenever their reagents changed because of the strict way that `/datum/component/takes_reagent_appearance` compares container types. - `/datum/component/takes_reagent_appearance` now allows for an alternate type to check against `glass_style.required_container_type` via a var called `base_container_type`. The filled glasses now set this var to the main drinking glass type. - As well, filled glasses didn't have their appearance set up to match the corresponding glass style. Thus, the `/obj/item/reagent_containers/cup/glass/drinkingglass/filled` type now updates its appearance on initialization. - Seperately, the small carton's appearance broke if you put a reagent in that doesn't match a glass style, reverting to the "water_cup" icon state which doesn't exist in the boxes.dmi file. This is because it was a subtype of sillycup, but there is nothing gained as far as I can see from that type relationship, so the small carton was repathed to `/obj/item/reagent_containers/cup/glass/smallcarton`. * Fixes prefilled drinking glasses, and small carton icon Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
bccf824a6c |
[MIRROR] Turned most syndicate mobs (+ viscerators) into basicmobs [MDB IGNORE] (#18270)
* Turned most syndicate mobs (+ viscerators) into basicmobs (#71871) ## About The Pull Request Turns the syndicate simpleanimals into basicmobs: (+ stormtrooper, + space variants) Base Mob, Knife syndies, pistol syndies, SMG syndies,shotgun syndies, viscerators also changes some instances of the simple_animal path into the basicmob ones Removes civillian syndicates which were useless and also completely unused Also removes mech pilots:  Also, makes the basic targetting datums health check configurable basic attack behavior can now fire in bursts https://user-images.githubusercontent.com/70376633/206766607-cf2e3659-0c5e-4117-9af7-e573e35bdf80.mp4 https://user-images.githubusercontent.com/70376633/206766630-15b4469f-68be-44c7-9394-1f2b6fe07811.mp4 https://user-images.githubusercontent.com/70376633/206766613-69b42457-a03b-449d-a1b8-a5aa556c76e5.mp4 https://user-images.githubusercontent.com/70376633/206766619-5560a178-8d2f-4b22-adf1-22ace6f63a51.mp4 https://user-images.githubusercontent.com/70376633/206766627-e671d064-fd9e-4204-b823-aa2e07f7fc26.mp4 https://user-images.githubusercontent.com/70376633/206766633-108c1574-3554-4bc1-a9ac-8faed0ec4062.mp4 ## Why It's Good For The Game simpleanimal stinks basic mob good syndicate AI was really bad to begin with so here we are ## Changelog 🆑 code: Turned most syndicate mobs into basicmobs, making their AI better and (possibly) more deadlier! del: Removed syndicate mech pilots and syndicate civvies /🆑 Co-authored-by: kawoppi <94711066+kawoppi@ users.noreply.github.com> * Turned most syndicate mobs (+ viscerators) into basicmobs * map * code * Update syndibase.dmm Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> Co-authored-by: kawoppi <94711066+kawoppi@ users.noreply.github.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
625b66bd0c |
[MIRROR] Refactors bar drink icons into datum singletons / unit tests them [MDB IGNORE] (#18140)
* Refactors bar drink icons into datum singletons / unit tests them (#71810) - Refactors bar drink icons. - Juice boxes no longer have a hard-coded list of a bunch of reagent types in their update state, and use a system similar to bar drinks. - Glass and shot glass icon information are no longer stored on the drink. Instead, they are now stored in glass style datums. These datums store name, description, icon, and icon state of a certain container + reagent type. - Glass styles are applied via the `takes_reagent_appearance` component. Glasses, shot glasses, and juice boxes have this component. - This comes with support for being able to have drink icons from different files, rather than requiring the drinks DMI. - The britmug is now a subtype of mug. - 1 new icon: britmug filled. - Various small code clean-up around drink reagents. - Unit tests icon state setups for glass styles as well as all `/drink` reagent container subtypes. - Splits up the massive `drinks.dmi` into separate files. *Disclaimer: Much of the drinking glass datums were written via script automatically, so there may be errors present.* - Much easier to add new drink styles, much more modular. - It is no longer necessary for new drinks to be added to the massive `drinks.dmi`. People working with drinks in the future can simply add their glass style datum and point it to their file wherever it may be. - Expandable system. Adding a new type of reagent container that works similarly to bar drinks but for different types of icons is a breeze. - Ensures going forward no bar drinks have invisible sprites. 🆑 Melbert refactor: Refactored how bar drinks set their icons. Juice boxes now use the same system. /🆑 * Well that's all of them, unit tests prove me wrong * now its a mapping pr lmao * SHUT THE FUCK UP Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Funce <funce.973@gmail.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com> |
||
RatFromTheJungle
|
473e875e46 |
[fix oh fuck fix fix] there is no more .357's where they weren't meant to be (#18024)
* Update bolt_nanotrasen_firearms.dm * Update _armaments_secondary.dm * Update guns.dm * missed instances Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
SkyratBot
|
2b800b9a23 |
[MIRROR] Removes tablets (not PDAs) entirely. [MDB IGNORE] (#17880)
* Removes tablets (not PDAs) entirely. * contractor changes * map changes * Update assistant.dm * conflicts Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
Paxilmaniac
|
b8e1b526d8 |
Undoes the disaster that is having two different 9mm and 10mm rounds when you can achieve the same exact thing with a single var on the gun (#17819)
* noooo more 9mm peacekeeper * 10mm too * advanced this advanced that * advanced ammo boxes still curse me from the grave * I HATE BLACK MESA!!!!!!!! * de-autos the 10mm |
||
|
SkyratBot
|
fae49b67ef |
[MIRROR] Overhauls beach bar, adds griddle and oven to some ruins [MDB IGNORE] (#17874)
* Overhauls beach bar, adds griddle and oven to some ruins (#71558) * Overhauls beach bar, adds griddle and oven to some ruins Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com> |
||
|
SkyratBot
|
911bbb3f06 |
[MIRROR] [MDB IGNORE] Grayscale sofas [MDB IGNORE] (#17851)
* [MDB IGNORE] Grayscale sofas (#71539) ## About The Pull Request Ports some sofa sprites from over at https://github.com/BeeStation/BeeStation-Hornet/pull/7547 and makes them grayscale. Also random tool colours now use defines.   ## Why It's Good For The Game Gives us the opportunity to make different coloured couches more easily. ## Changelog 🆑 Tattle, PestoVerde322 imageadd: couches are now grayscale code: random tool colours now use defines /🆑 Co-authored-by: tattle <article.disaster@ gmail.com> * [MDB IGNORE] Grayscale sofas * runs the update paths Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: tattle <article.disaster@ gmail.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com> |
||
|
SkyratBot
|
0fb69dd6e5 |
[MIRROR] Moves the bulk of shield code from the riot subtype into the core shield. [MDB IGNORE] (#17684)
* Moves the bulk of shield code from the riot subtype into the core shield. (#71066) ## About The Pull Request I wanted to "rework" the riot shield security has but most other shields are subtypes of it, making them all inherit those features. So I made this PR first to make my job easier and fix some odd bugs like fixing wooden bucklers by slapping them with titanium sheets... There *shouldn't* be any other big change outside of the titanium healing and baton bashing they all inherited but I have been staring at shield code and worked on another branch before deciding to split the code improvement/fixes from the features so I might have missed something. And while there, kill some single letter vars, remove unnecessary lines, etc. ## Why It's Good For The Game Fixing a wooden shield by slapping it with titanium is weird... so is fixing a glass+iron shield but that is a bigger balance change. And well, easier for future shield changes to not inherit weird behaviors from the riot shield. ## Changelog 🆑 Guillaume Prata fix: You can no longer repair wooden bucklers and roman shields by slapping them with a titanium sheet. /🆑 * Moves the bulk of shield code from the riot subtype into the core shield. * sr conflits, goliath shield, reagent buckler Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
6693611532 | [MIRROR] Trophy case update [MDB IGNORE] (#17616) | ||
|
SkyratBot
|
ceb690a555 |
[MIRROR] Refactor janicart to be subtype of mop bucket [MDB IGNORE] (#17647)
* Refactor janicart to be subtype of mop bucket * SR path changes Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
e951b50c1f |
[MIRROR] Updates ice cabin kitchen with modern equipment. [MDB IGNORE] (#17672)
* Updates ice cabin kitchen with modern equipment. (#71088) ## About The Pull Request At the moment the ice cabin is quite outdated in the way that it only has microwaves as methods to cook, this is extra awkward as most of the food you get in this away method is meat. This updates the room by including a griddle and oven to make some nice edible food.  ## Why It's Good For The Game Do you want to spend a round in an ice cabin where the only food source is eggs boiled in a microwave? ## Changelog 🆑 fix: Updates the Ice cabin kitchen to be more modern. An oven and griddle have been added. /🆑 Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Updates ice cabin kitchen with modern equipment. Co-authored-by: carshalash <carshalash@gmail.com> Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> |
||
|
SkyratBot
|
4b6c93f6b9 |
[MIRROR] Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits. [MDB IGNORE] (#17306)
* Easy's Super Omega "unarmed strike based species var moved to limbs" refractor, unarmed strike striking with specific body parts rather than it just being flavor, and brain based attacking limb selection extra chunky edition. And also bodypart traits. * Removed all the conflicts, and started converting all the arms and legs to the proper typepaths * Actually makes the game compile :) * Makes the maps compile too! * Early mirror of #71143 because it's more relevant to us Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> |
||
|
SkyratBot
|
4b11bc848f |
[MIRROR] [MDB IGNORE] Clothing var cleanup [MDB IGNORE] (#17329)
* [MDB IGNORE] Clothing var cleanup * modular changes except sec helmet * SR maps * Fixed sec helmet since it was custom toggling anyway, lots of misnamed icon states Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
OrionTheFox
|
d1262db27b |
[MDB IGNORE] Updates Departmental Guard icons, sorts files (#16892)
* DeptGuard code cleanup * stupid fekin hat * icons!! woo!! :( * 1px shorter shorts (works better for digi!) * bouncer has SR uniform, cleaner suits, fix missing icon * fuck this coat lmao * pre-master-merge conflict fix * this is much less oppressive but still implies authority * just a touch of asymmetry... * much cleaner coveralls * it's... workable. I might put the vest back after testing idk!! * mfw 2 pixels need changing for digi :( * tf-4 grammar suggestion yesyes Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * albefeeteze * le formatting Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
Zonespace
|
ccf55f31c3 |
Removes the vanguard role (#17173)
* removes vanguard entirely * removes final bits * nerfs vanguard content further * whoops * Update modular_skyrat/modules/cargo/code/packs.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/black_mesa/code/ghost_spawners.dm * Update modular_skyrat/modules/black_mesa/code/ghost_spawners.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
SkyratBot
|
62c02030e3 |
[MIRROR] Convert mouse and rat to basic mobs [MDB IGNORE] (#17215)
* Convert mouse and rat to basic mobs * run the UpdatePaths script you borb * packs and nests Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
097e913e4b |
[MIRROR] Removes tablet hard drives entirely (HDD & SSD) [MDB IGNORE] (#17164)
* Removes tablet hard drives entirely (HDD & SSD) * map updates * changes * contractor uplink theme * uplink improvements * tab Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
|
Paxilmaniac
|
6a0cbae75f |
Kills every single instance of baked in color decal floors on the maps (Today on making prs that conflict with other prs I have open) (#16815)
* the misery * i literally did this one to myself * gives some color back to the world * what's the addiction with making every new station a ship? |
||
Gandalf
|
3e7b55299f |
MAP RESET (#16735)
* E * ew |
||
|
SkyratBot
|
3795ed1a6b |
[MIRROR] [MDB Ignore]Hats DMI split [MDB IGNORE] (#16693)
* [MDB Ignore]Hats DMI split * e * STAFE * e * e Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> |
||
|
SkyratBot
|
e4d59278a0 |
[MIRROR] [MDB IGNORE] Shuttle engines part 2: Engines are now machines [MDB IGNORE] (#16676)
* [MDB IGNORE] Shuttle engines part 2: Engines are now machines (#69793) * Makes engines machines instead of structures * Updates the maps * Fixes boards and anchoring * Removes 2 unused engine types Router was actually used a total of once, so I just replaced it with propulsion. I think cutting down on these useless engine types that make no difference in-game would be a nice first step to adding more functionalities to them. * Don't use power (since shuttles dont have) Shuttles don't have APCs, instead they just have infinite power, so I'm removing their power usage for now. I'm hoping this can be removed when unique mechanics are added to engines, because I would like them to make use of power like other machines. * re-organizes vars * deletes deleted dm file * Slightly improves cargo selling code * Renames the updatepaths * Removes in_wall engines I hate this stupid engine it sucks it's useless it's used solely for the tram it provides nothing of benefit to the server replaces them with regular engines * [MDB IGNORE] Shuttle engines part 2: Engines are now machines * should fix that * THEY. REMOVED IN WALL ENGINES. THE BASTARDS. * common mining shuttle Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> |
||
Stalkeros2
|
6693828b27 |
Black Mesa polishing-of-ancient-content (#16396)
* i erm * what the fuck is toolbox.dm * huh * first batch * should be it * Update armament_miscellaneous.dm * Update armor.dm * Mesa Glock 17 to Glock 20; MP5 to MP5/10 * finally, EASes * spreading the tapes too * making baseturf generators subjectively better * pain and suffering for explorators * -1 bad idea * Update blackmesa.dmm * Update fluff.dm * Apply suggestions from code review Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> * Update modular_skyrat/modules/black_mesa/code/armaments/armament_utility.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> * should be it??? * chicken nuggies :) * Squashed commit of the following: commit |
||
ORCACommander
|
10d33b276c |
[MDB IGNORE] Ran Migration Script for Lights (#16653)
ran migration tool |
||
|
SkyratBot
|
d0b706c041 |
[MIRROR] Removes AI and Charge parts from tablets, adds support for more later. [MDB IGNORE] (#16381)
* Removes AI and Charge parts from tablets, adds support for more later. * merge conflict * remove modular tablet loadout item * fix SR maps referencing tablets, add clear PDA instead of modular tablet loadout * remove pda loadout item Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
|
SkyratBot
|
049b19bb18 |
[MIRROR] Moves "catch this var/flag" code from obj/init and datum/new into the types that use it [MDB IGNORE] (#16091)
* Moves "catch this var/flag" code from obj/init and datum/new into the types that use it * Update atoms_movable.dm * Update airlock.dm * SRCC Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com> |
||
|
SkyratBot
|
7d84a2c507 |
[MIRROR] Removing trailing / from several mapping regexes [MDB IGNORE] (#16150)
* Removing trailing / from several mapping regexes (#69448) * Removing trailing / from several mapping check regexes So we have check_grep.sh which helpfully checks for a bunch of common map mistakes, including doubled up items. This adjusts them to capture doubled up base types which might be mapped in. * Commit before pushing next time * Removing trailing / from several mapping regexes * Commit Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com> |
||
|
SkyratBot
|
7559990f20 |
[MIRROR] [MDB IGNORE] Shuttle engine code improvement and fixes [MDB IGNORE] (#16116)
* [MDB IGNORE] Shuttle engine code improvement and fixes * what even happened in shuttlepanel.dm * should be the last few Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> |
||
|
SkyratBot
|
24d126cf8a |
[MIRROR] Improves sleeper code and makes syndie sleepers deconstructable [MDB IGNORE] (#16149)
* Improves sleeper code and makes syndie sleepers deconstructable (#69457) * Improves sleeper code and makes syndie sleepers deconstructable * Improves regular Sleeper code by a lot considering last time they were touched was years ago, removes the entirely unused sleep_console, and lets Syndicate sleepers get deconstructed regardless of mapload. * Also finally lowercases the dm file. * watch this swag * no clue if this will work but I'm gonna try before renaming * rename, and removal of syndie sleepers Removes syndicate sleepers from non-syndicate maps. Now they only exist in the infiltrator, battlecruiser, and syndicate lavaland base. * small mistake on snowdin * re-replaces sleepers with proper ones * review comments * i mixed it up with chem_buttons * Update code/game/machinery/sleepers.dm Co-authored-by: Seth Scherer <supernovaa41@ gmx.com> * Update code/game/machinery/sleepers.dm Co-authored-by: Seth Scherer <supernovaa41@ gmx.com> Co-authored-by: Seth Scherer <supernovaa41@ gmx.com> * Improves sleeper code and makes syndie sleepers deconstructable Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Seth Scherer <supernovaa41@ gmx.com> |
||
|
SkyratBot
|
c2189d5818 |
[MIRROR] adds structure spawners for electrified grilles, adds greps for some fulltile window spawners [MDB IGNORE] (#15954)
* adds structure spawners for electrified grilles, adds greps for some fulltile window spawners (#69528) * adds structure spawner for electrified grilles * sdmm key cleanup * adds structure spawners for electrified grilles, adds greps for some fulltile window spawners * should fix blueshift lints lets see * should resolve most if not all of the others * damn you skyrat map reset Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com> Co-authored-by: Paxilmaniac <paxilmaniac@gmail.com> |
||
|
SkyratBot
|
9847332609 |
[MIRROR] Police hats are now hats instead of helmets. [MDB IGNORE] (#16102)
* Police hats are now hats instead of helmets. (#69643) * Fixes police hats covering your hair. Makes police hats a subtype of Warden's hats, so they still are security-level armor, without covering your hair like helmets do. This was gone unnoticed because the item is very limited in-game. I also renamed the gravity generator updatepaths because it's been inconsistent with the rest of the updatepaths for a while now. * renames updatepaths * Update tools/UpdatePaths/Scripts/69643_police_hat.txt Co-authored-by: san7890 <the@ san7890.com> * moves the hat to warden's, removes icon state Turns out the icon state is shared between both hats, so the only real difference is name and description... Co-authored-by: san7890 <the@ san7890.com> * Police hats are now hats instead of helmets. * Update head.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: san7890 <the@ san7890.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
SkyratBot
|
96761dae1a |
[MIRROR] [MDB IGNORE] APC controller and Power Monitor/AmpCheck fixes, aka How do I write PR titles [MDB IGNORE] (#15987)
* [MDB IGNORE] APC controller and Power Monitor/AmpCheck fixes, aka How do I write PR titles (#69146) About The Pull Request bgug fix stuff APC controller UI has its elements section'ed off. The backend has been redone to make the behaviour of the APC controller a bit less janky. The console should be more stable, and all the soul has been removed from the code and the UI. before this PR stales out from nobody wanting to review my pr, I should probably outline what exactly changed: APC controller consoles have had their APC code almost entirely reworked. They no longer have to hold a reference to the person using the controller currently, and APCs themselves no longer hold a reference to the controller, instead to the person directly. A lot of code was moved to APC themselves to make it a lot more stable. APC controller used to call toggle_breaker without passing args, causing a runtime. Fixed in Fixes the power flow control console not actually being able to toggle breakers #69343 APC controller UI has had the Window.Content tags moved up to the top component, and a lot has been sectioned off to make the UI more sane. AmpCheck used to look for a wire on it's turf, or as a fallback look for the Area APC. A check to see if the APC has a terminal did so on a weakref, causing a runtime and preventing the program from ever finding a valid APC in it's area, making it show nothing. This has been fixed. On the other hand, the power monitor console did not store the ground wire or APC terminal as a weakref, this has been updated. As a fallback, if there are still no APCs in the powernet, the UI will show a dimmer popup. There was a "secret" power monitor variation in code so PDAs could not access monitors in hidden places. With the removal of PDAs, this control console is useless. Why It's Good For The Game Tiny bit of (much needed) polish on some useful tools in the engineering department. Changelog cl fix: Fixed runtime when using AmpCheck without connecting the console with a wire. fix: Fixed a few runtimes that could occur when using APC controller consoles. qol: Sucked soul out of APC controller code and UI. del: Removed "secret" power monitor console. /cl * [MDB IGNORE] APC controller and Power Monitor/AmpCheck fixes, aka How do I write PR titles * update paths Co-authored-by: distributivgesetz <distributivgesetz93@gmail.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
SkyratBot
|
c93f3745d8 |
[MIRROR] [MDB IGNORE] Improves status display even more, makes the brig door timers based on status displays [MDB IGNORE] (#15865)
* [MDB IGNORE] Improves status display even more, makes the brig door timers based on status displays * conflicts * maps Co-authored-by: Tastyfish <crazychris32@gmail.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
SkyratBot
|
895096a37d |
[MIRROR] [MDB IGNORE] Fix High Capacity APC Inheritance [MDB IGNORE] (#15945)
* [MDB IGNORE] Fix High Capacity APC Inheritance (#69526) Doing some mapping work downstream and I noticed there were both directional and non directional high caps. Code dived to figure out which was the valid one to use and found the directional high caps were not actually inheriting the upgraded power cells do to bad name structure. Corrected inheritance structure. Updated Kilo and Icebox to use directional high caps as standard and updated several ruin and gateway missions to standard directional high caps * [MDB IGNORE] Fix High Capacity APC Inheritance Co-authored-by: ORCACommander <orcacommander1@gmail.com> |
||
|
SkyratBot
|
88c85fe1f7 |
[MIRROR] [MDB IGNORE] Refactors drinks and fixes a lot of food problems [MDB IGNORE] (#15577)
* [MDB IGNORE] Refactors drinks and fixes a lot of food problems * [MDB IGNORE] Refactors drinks and fixes a lot of food problems * forgto 2 commit * im slowly going insane * why does find and replace not FIND everything * hnghnnngh * h * l * a * a * so close... * delta fix * I thought I committed this already, guess not * this PR has been the bane of my fucking life * orange juice Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com> |
||
|
SkyratBot
|
4eac66d790 |
[MIRROR] Labor camp machines - Fixes & Code improvement [MDB IGNORE] (#15392)
* Labor camp machines - Fixes & Code improvement (#68584) About The Pull Request Visible changes (all the fixes): Labor point checkers now says the prisoner ID's stats rather than being a to_chat, it also displays their info much better. Labor stacker no longer duplicates your points at no cost by attacking the machine with materials, instead it processes it just like it would when sucking materials up. Labor stackers additionally now update their input/outputs when they are rotated through shuttles, as it doesn't work on the current version of Lavaland (there's no issue report up on this yet though, oddly). Adds a check if you actually have a goal before checking if you can send the shuttle up, preventing prisoners who were sent without a point goal (permanently) from being able to go up whenever they wanted by simply clicking on the button before it greyed out. The rest (code improvement): Added more early returns Removed single letter vars Renamed terribly named vars and added comments to some of them. Removed machinedir in favor of checking their view() when syncing machines, as I didn't find checking an entire side of the map next to an object to be very intuitive. Lets Lavaland use labor camp machines again Closes #67764 Just cool general fixes +1 Changelog cl fix: Labor camp Prisoners without a sentence can no longer send themselves back up whenever they wanted by clicking the button fast enough. fix: Prisoners can no longer get infinite labor camp points by clicking the stacking machine with ores. fix: All ore machines now properly change their direction when they dock a shuttle in a separate direction, fixing Lavaland's labor camp stacking machine. qol: Labor camp's point checker now states all the information you need, rather than being a paragraph of text that just appears in chat. /cl * Labor camp machines - Fixes & Code improvement * MAP RESET * Update labour_skyrat.dmm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> |
||
|
SkyratBot
|
b1bd40e760 |
[MIRROR] [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition> [MDB IGNORE] (#15362)
* [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition> * Fixes merge conflicts and compilation errors, alongside fixing the joker card to make it fully functional again * Fixed a bunch of info variables in map files * Alright this is why I wanted this merged yesterday Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> |
||
|
SkyratBot
|
99cdbe4ce2 | [MIRROR] Reworks pAIs [MDB IGNORE] (#15162) | ||
|
OrionTheFox
|
b15331b4df |
[MANUAL MIRROR] The GAGening: Clothesmate edition [MDB IGNORE] (#15100)
* The GAGening: Clothesmate edition * ThisShouldWork * hgnbhg * would probably help to have the right .dmi * fixed? * Fuck you Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com> |
