mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-28 02:21:53 +00:00
* Fixes incorrect operator usage in mecha code (#82570) ## About The Pull Request I completely screwed up and told the original PR author of #82415 (9922d2f237) to use the `XOR` operator instead of the `OR` operator (I wasn't thinking right for some reason when I was reading the ref), anyways this PR just fixes that because I misled the contributor into doing something that wasn't correct and actually would BREAK functionality instead. * Fixes TGUI debugging tools (#82569) This project doesn't interfere with the game logic and aims to fix multiple debugging features that are currently broken. Unfortunately, kitchen sink and debug layout became broken after migration to Redux. This PR aims to fix those features. * Removes unused code for HTML UIs (#82589) ## About The Pull Request This is the final PR for https://hackmd.io/XLt5MoRvRxuhFbwtk4VAUA that I've been slowly inching towards the past few months. This removes ``updateDialog``, ``updateUsrDialog``, ``IN_USE``, ``INTERACT_MACHINE_SET_MACHINE``, and everything surrounding it. Also fixes advanced camera consoles not booting you off when you're moved out of reach. We called ``check_eye`` on mob life whenever they had their machine var set, but their machine var would never be set to anything that actually used it, which I found to be a little funny but was also probably my fault. ## Why It's Good For The Game This is poor and unmaintained code used for HTML UIs that we no longer need thanks to TGUI, we should get rid of it to encourage the use of TGUI in the future instead. ## Changelog 🆑 fix: Advanced camera consoles now boots you off when you're moved out of reach. /🆑 * Fixes a variety of input stalling exploits (#82577) ## About The Pull Request Fixes the following input stalling exploits (maybe missed some): - Changing GPS tag - Setting teleporter destination - Request Console Reply - Various AI law board interactions - Note, I used `is_holding` but technically this means these fail with telekinesis. I can swap them to `can_perform_action(...)`, which allows TK, but I noticed some places explicitly deny TK interactions with Ai law boards. Not sure which is preferred. - Borg Rename Board - Plumbing Machines and Ducts - APCs and SMES terminal placements - Stargazers Telepathy - Go Go Gadget Hat ## Changelog 🆑 Melbert fix: You can't change the GPS tag of something unless you can actually use the GPS fix: You can't set the teleporter to a location unless you can actually use the teleporter fix: You can't reply to request console requests unless you can actually use the console fix: You can't update AI lawboards unless you're actually holding them fix: You can't update a borg rename board unless you're actually holding it fix: You can't mess with plumbing machines unless you can actually use them fix: You can't recolor / relayer ducts unless you're actually holding them fix: You can't magically wire APCs and SMESs unless you're right by them fix: You can't use Stargazer Telepathy on people who you can't see fix: You can't configure the Inspector Hat unless you can actually use it /🆑 * [NO GBP] Power outage operation fixes for chem master (#82591) ## About The Pull Request - If the chem master runs out of power mid printing, it will properly stop the printing process and its animation - When transferring reagents it correctly checks if we have enough power without forcing it ## Changelog 🆑 fix: chem master properly shuts down if it loses power mid printing and won't transfer reagents for the same /🆑 * Refactor renaming UNIQUE_RENAME items from the pen to an element (#82491) ## About The Pull Request So a bit ago someone in code_general wanted to make plushies renamable, but learnt that just adding the `UNIQUE_RENAME` flag wouldn't work as pens would murder the plushie and only THEN let you rename it. I noted refactoring both pens and plushies to use the new `item_interaction(...)` procs would Just Solve This, but, well, they didn't really have any coding experience. But, hey, renaming being hardcoded to the pens has annoyed me ever since I laid my eyes upon the hot mess that is paperwork code. So here we are! ### We're making it an element. There's not really much to this, this is mostly the same code but moved to an element and with some minor cleanups. First, we move it all from `/obj/item/pen` to a new element we called `/datum/element/tool_renaming`. With this, instead of having it proc on `/obj/item/pen/afterattack(...)`, we register it to proc on the `COMSIG_ITEM_INTERACTING_WITH_ATOM` signal.6e36ed9840/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm (L59-L62)Secondly, we realize the code is just going through each if statement regardless of whether the previous was correct.6e36ed9840/code/modules/paperwork/pen.dm (L225-L258)And, as we're dealing with text, just make it a switch statement instead. ```dm switch(pen_choice) if("Rename") (...) if("Description") (...) if("Reset") (...) ``` Then, we replace all single letter variables with descriptive ones, replace the if-elses with early returns, and make it actually return item interaction flags. Finally, we slap this onto the pen, and we're done. Now we can slap it onto other fitting renaming tools, and it uses the proper item interaction system. ## Why It's Good For The Game I feel it's generally better to not hardcode this to just pens, we have plenty other writing utensils and possible renaming tools. It's also a bit cleaner than before. Apart from that, moves it from using `afterattack(...)` to the proper item interaction chain by using `COMSIG_ITEM_INTERACTING_WITH_ATOM`, which should reduce janky interactions. ## Changelog 🆑 refactor: Instead of being hardcoded to the pen, renaming items is now an element. Currently only pens have this, and functionality should be the same, but please report it if you find any items that were renamable but now aren't. /🆑 * Adds various quality of life changes for cooking to make it less click intensive. (#82566) ## About The Pull Request - Increases tray item size by 1 item. - Ranges and griddles can now be fed from trays. Click when closed => fill soup pot. Click when open => fill associated oven tray. Right click when open => fill tray from oven tray Click griddle => fill griddle surface. Right click => fill tray from griddle surface - Martian batter is now 5u of each ingredient into 10u of batter. Hopefully will make it bug out less where it makes far fewer reagents than it is supposed to, fixing reagents, or well soups specifically... is out of scope for this PR. - Adds the ability to print soup pots and large trays from the service lathe Soup pot: 5 Iron sheets, 0.4 bluespace crystal (given their size of 200U) Large serving tray: 2 iron sheets ## Why It's Good For The Game Makes cooking a lot less tedious. Especially for people with low precision when it comes to filling oven trays. This also bring the behavior up to parity with how you can click microwaves with trays to fill them, ditto for the food processor. It also allows chef to use the whole capacity of an oven, as previously you couldn't easily click 6 cake batters or other giant sprites onto the tiny tray. The tray is now sized to be able to easily feed a griddle 8 items. ## Changelog 🆑 qol: chef equipment can now deposit and withdraw to/from trays! qol: chef now has access to griddle and oven sized trays! qol: service can now print soup pots /🆑 --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> * Removes grid usage + heavy refactors (#82571) ## About The Pull Request Grid has been deprecated for quite some time and we still use it. I won't completely remove the component, this way downstreams won't immediately suffer, but I can remove it from usage. Some of these UIs had issues with them and as a hobby project I've refactored them into typescript / rebuilt them. Airlock electronics, for instance, looks substantially better. <details> <summary>before/after as requested</summary> current airlock electronics scrolls into oblivion  updated  </details> ## Why It's Good For The Game Code improvement + probably UI bug fixes ## Changelog 🆑 fix: Airlock electronics and other access-config type UIs should look much better. /🆑 * modular fixes * [No GBP] Removes cogbar from some stealthy actions (#82593) Issue brought some missed hidden actions to my attention. I left cogbars in for _breaking_ handcuffs because resisting is sort of a gray area. On one hand, you don't want someone to see you doing it; on the other, there is a visible warning that you started doing it. So, meet in the the middle, breaking handcuffs is still visible while resisting isn't. Closes #82583 Cogbars are not intended to ruin stealth 🆑 fix: Deviants buffed: Rogue shoelacing, pickpocketing and restraint resisting no longer give cogbar icons. /🆑 * [NO GBP] ...Remember to add SIGNAL_HANDLER (#82630) ## About The Pull Request Just realized I forgot to add `SIGNAL_HANDLER` to the all-nighter `on_removed_limb(...)` proc, even though it handles signals. ## Why It's Good For The Gamefe26373572/code/__DEFINES/dcs/helpers.dm (L9-L11)* React cleanup (#82607) ## About The Pull Request - No defaultHooks in react. Might fix issues where pages were not scrollable on hover. - createRef in a functional component. should be useref ## Why It's Good For The Game Code improvement * Security photobooths have their own ID (#82628) ## About The Pull Request Prevents the HoP's photobooth button from connecting to the security photobooth via having the same ID. ## Why It's Good For The Game I forgot to add this when I made the security photobooth but it's important that by default without any varedits, the HoP and security photobooths stay separate. ## Changelog 🆑 fix: The HoP's photobooth button is now consistently connected to the HoP's photobooth. /🆑 * Fix buckled alert unbuckling not working properly (#82627) ## About The Pull Request So funny thing, while trying to reproduce a different issue on the current master, I coincidentally let my local instance start without reading, latejoined on the shuttle, and I noticed it wasn't letting me unbuckle as easily. Looking into this a bit later, it seems as if it's a line #82593 accidentally changed while moving around the `/mob/living/carbon/resist_buckle()` proc's flow.fe26373572/code/modules/mob/living/carbon/carbon.dm (L238-L241)While before it was ```dm /mob/living/carbon/resist_buckle() if(HAS_TRAIT(src, TRAIT_RESTRAINED)) (...) else buckled.user_unbuckle_mob(src,src) ``` Just changing this to `buckled.user_unbuckle_mob(src, src)` fixes this. ## Why It's Good For The Game Fixes buckled alert unbuckling not working properly. Fixes #82627. ## Changelog 🆑 fix: Clicking the buckled alert unbuckles you again. /🆑 * Advanced camera consoles correctly deactivates when something happens to it or the user (#82619) ## About The Pull Request - Fixes #82520 1. The eye deactivates when the machine is destroyed/deleted 2. The eye deactivates when the machine loses power 3. The computer constantly moniters the users status inside `process()` and will deactivate when anything happens to them. Its not enough to just hook onto to the mobs `COMSIG_MOVABLE_MOVED` signal. Literarly anything can happen to them so we have to check constantly for any changes ## Changelog 🆑 fix: advanced camera consoles correctly deactivate when something happens(no proximity, no power etc) to its user /🆑 * Oven tray checks for ovens (#82615) ## About The Pull Request - Fixes #82610 Only oven trays have this proc not serving trays or other stuff  Also oven trays have a null atom storage which prevents it from being put back in the oven after taking it out. So we remove that check ## Changelog 🆑 fix: you can put back the oven tray after you take it out fix: only oven trays are allowed in ovens preventing baked food runtimes /🆑 * Living Limb fixes (feat: Basic mobs attack random body zones again) (#82556) ## About The Pull Request Reworks Living Limb code to fix a bunch of runtimes and issues I saw while testing Bioscrambler. Specifically, the contained mobs are now initialised via element following attachment so that signal registration can occur at the correct time. This allows limbs to function correctly when added from nullspace via admin panel or bioscrambler. Secondarily (and more wide-ranging) at some point (probably #79563) we inadvertently made basic mobs only attack the target's chest instead of spreading damage. This is problematic for Living Flesh which can only attach itself to damaged limbs but was left unable to attack damaged limbs. I've fixed this in a way which is maybe stupid: adding an element which randomises attack zone pre-attack. Living limbs also limit this to _only_ limbs (although it will fall back to chest if you have no limbs at all). This is _technically_ still different, the previous behaviour used `adjustBruteLoss` and `adjustFireLoss` and would spread the damage across your entire body, but there isn't a route to that via the new interface and this seems close enough. ## Changelog 🆑 fix: Living Limbs created by Bioscrambler will be alive. fix: Living Limbs can once more attach themselves to your body. balance: Living Limbs will prioritise attacking your limbs. fix: Basic Mobs will once again spread their damage across body zones instead of only attacking your chest. /🆑 * RPG Loot: Revisited & READY (#82533) Revival of #72881 A new alt click window with a tarkov-y loading spinner. Replaces the object item window in stat panel. <details> <summary>vids</summary> toggleable grouping:  now lists the floor as first obj:  in action:  </details> - search by name - 515 image generator is much faster than alt click menu - opening a gargantuan amount of items shouldnt freeze your screen - groups similar items together in stacks by default, toggleable - shows tile as first item - <kbd>Shift</kbd> and <kbd>Ctrl</kbd> compatible with LMB 🖱️ - RMB points points at items (sry i could not get MMB working) - key <kbd>Esc</kbd> to exit the window. For devs: - A new image generation tech. - An error refetch mechanic to the Image component - It does not "smart track" the items being added to the pile, just reopen or refresh. This was a design decision. Honestly I just dislike the stat panel Fixes #53824 Fixes  🆑 add: Added a loot window for alt-clicking tiles. del: Removed the item browser from the stat panel. /🆑 --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: AnturK <AnturK@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> * Reverts parts of #82602 (nodeath checks) (#82637) ## About The Pull Request Reverts the nodeath checks of #82602 I opened a review thinking these checks were sus and the PR author said they would remove them, but it was merged before that happened. TL;DR 1. I just noticed this now but it only affects carbons / humans it doesn't even cover living or any other subtypes 2. Kinda sus. Some code intentionally skips checking nodeath (I guess? Like removing the brain for example) so we would need a larger audit of this rather than haphazardly throwing it in. * Fixes to battle arcade (#82620) ## About The Pull Request Added gear for world nine, removed the "Gear" gear that did nothing. Made counterattacks to kill an enemy properly kill the enemy. I renamed some gear items to fit the theme of the area they are unlocked in just as a small thing. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/82613 ## Changelog 🆑 fix: Battle arcade's higher levels no longer gives you a "Gear" gear, and counterattacks can now properly kill enemies. /🆑 * Fixes SMES terminal placing under the SMES and not under the player (#82665) ## About The Pull Request Changes `src` to`user` to get intended behavior. * Birdshot: Toy crate (#82633) ## About The Pull Request Gives the clown+mime their toy crate. ## Why It's Good For The Game *honk* * tram ai sat starts with a full smes (#82646) ## About The Pull Request consistency and also this is fixes a bug introduced by that one power refactor ## Why It's Good For The Game bug bad ## Changelog 🆑 fix: tramstation AI sat starts full /🆑 * [no gbp] Space Ruin bioscramblers shouldn't chase people around (#82649) ## About The Pull Request See title They wouldn't lock on to people on the station from a space ruin, but would to whoever entered their z level the second it was entered. Also fixes bug where I changed `status_flags` to `status_effects` for some reason which isn't where you look for godmode ## Why It's Good For The Game We have a space ruin whcih several (coreless) anomalies spawn on, the bioscrambler was put as an option because it was already immortal. It's weird though to zone into the ruin and immediately have every anomaly in there lock onto you, the best intended effect is probably for these ones specifically not to be bloodthirsty. We kind of only care about that behaviour on the station. ## Changelog 🆑 fix: Anomalous Research ruin Bioscrambler anomalies won't home in on targets fix: Bioscrambler won't randomly drop its target for no reason /🆑 * Sunders the many unused sprites and organizes what's left in structures.dmi (#82658) ## About The Pull Request Hello again, I noticed the /obj/structures.dmi file had a lot of unused stuff like tables from two generations ago, so I changed some stuff around: - Many unused, old icons deleted, mostly window variants used in old smoothing systems I imagine - Reorganized many sprites in the file so they're more grouped together - Tweaked some barricade sprite naming to be consistent/standardized, and to let others know they're not _too_ old... - Fixed a misnomer that I believe was making directional tinted windows look like frosted windows ## Why It's Good For The Game Saves on file space, and satisfies your brain's pattern recognition bits ### Spriting Old:  New:  also good lord those linen bin sprites are a crime ## Changelog 🆑 fix: Probably fixed directional tinted windows looking like directional frosted windows image: Deleted a bunch of unused structure sprites /🆑 * Birdshot Wall Sanity Pass (#82598) ## About The Pull Request Cleans up minor artifacting in the Birdshot Sec-Tram Closed Turfs ## Why It's Good For The Game Someone definitely didn't mean to place some machines under Closed Turfs. This barely qualifies as player facing. ## Changelog 🆑 fix: Cleans up some rocks on Birdshot /🆑 * [NO GBP] Fixes deconstruction of closets & crates under a special case (#82612) ## About The Pull Request So if a closet/crate has the `NO_DEBRIS_AFTER_DECONSTRUCTION` set on it and if someone/something is still inside, then after deconstruction they get deleted rather than getting dumped out first. Could cause potential hard delete of mobs & stuff. We don't want to deal with that ## Changelog 🆑 fix: closets & crates will dump all contents out first before deleting itself regardless of `NO_DEBRIS_AFTER_DECONSTRUCTION` thus not for e.g. hard deleting mobs inside it /🆑 * Fixes ordinance lab igniter in IceBox (#82595) ## About The Pull Request - Fixes #82294 Basically the same idea of merging ordanance lab with the burn chamber so they share the same apc as already implemented in #82322 ## Changelog 🆑 fix: Ordinance lab igniter in Icebox works again /🆑 * Birdshot: engi wardrope. (#82639) ## About The Pull Request Add engi wardrope on Birdshot. ## Why It's Good For The Game Birdshot doesn't have engi wardrope. 🆑 fix: Birdshot now have engi wardrope /🆑 * Gives shadow walk a new, spookier, and shorter sound effect that no longer ignores walls (#82689) ## About The Pull Request This gives shadow walk a snazzy new sound effect for entering/exiting jaunt. https://github.com/tgstation/tgstation/assets/28870487/c25f720f-5bad-4063-8d6e-140fd41bd740 This also has the sounds it plays no longer passes through walls. ## Why It's Good For The Game The ethereal_entrance/exit sound effects are drawn out, and pretty grating. They work for the other jaunts they're used for because a jaunt typically lasts longer than the sound itself. Nightmares are frequently dancing in and out of jaunt, and the sound effects for entering/exiting tend to overlap. It gets loud and annoying really fast. This sound effect is quicker, spookier, and more distinct. As for making the sound not ignore walls, I think it's pretty dumb how easy it is to detect the spooky scary shadow antag just by sitting in your department. It takes a lot of the initial fear and paranoia they have the potential for is wasted when Joe Geneticist can hear them messing around in their territory without having to leave their chair. ## Changelog 🆑 Rhials sound: Nightmare has a new sound effect for entering/exiting shadow jaunt. It also no longer can be heard through walls. /🆑 * [MIRROR] Alt click refactor (#2029) * Alt click refactor * Some early conflict removal * Big modular refactor * Update console.dm * Update paper.dm --------- Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: Mal <13398309+vinylspiders@users.noreply.github.com> * Yeets `ATTACK_QDELETED`, fixes welding torches not using fuel on attacking non-mobs (2 year old bug) (#82694) ## About The Pull Request - Deletes `ATTACK_QDELETED` - May have been necessary in the past but it's pointless now. All it does is clutter the attack chain. Perish. - Fixes welders not using fuel on attacking non-mobs - #65762 "fixed" welders consuming fuel on clicking turfs by adding an `isliving` check and not an `ismovable` check? ## Changelog 🆑 Melbert fix: Blobs may rejoice, welding torches now consume fuel when attacking objects again after two years. /🆑 * electric_welder fire * Quirks, which give items, now have quirk_item arg specified as obj/item, instead of being just a var (#82650) ## About The Pull Request quirk_item is now /obj/item, since it will allow for calling procs or getting variables from this item It's required for non-modular translation to call for item's name to remove articles ## Why It's Good For The Game It's always an item, and if it's a path, it's already checked for it. Better usage in the future. * turns martial arts gloves into a component (#82599) sleeping carp gloves also work on mind init this means for the sake of deathmatch you dont have to put them off and on fixes #82321 🆑 fix: you no longer need to put your sleeping carp gloves off and on in Deathmatch to get the martial art /🆑 --------- Co-authored-by: san7890 <the@san7890.com> * Regal Rats can now tear down posters (#82673) ## About The Pull Request i was fixing something on bagil and someone who was playing a regal rat (after the round ended) said they wanted to be able to tear down posters as a regal rat so i decided to code it because it made sense. it's an element so literally any mob can tear down posters but i can't think of any other mobs that would make sense to let it tear down posters so we'll leave it just for _The Champion of All Mislaid Creatures_ for now ## Why It's Good For The Game Regal Rats should be all about sludgemaxxing and fucking up maintenance to make it look even more grody than it should be. Being able to tear up those disgusting and well-drawn posters to leave behind nothing but scraps fits that motif. The element has a `do_after()` just to make sure His Holiness doesn't accidentally tear down his posters while clicking (i think all mobs should have this but that's a different issue man) also includes some code improvement and user feedback in some failure cases that already existed in the code. ## Changelog 🆑 add: Regal Rats are now able to tear down those colorful posters those weird grey creatures keep spackling up on the walls of their rightful domain. /🆑 * Adds "Strong Stomach" quirk, a core CDDA/PZ quirk we've sorely been missing. Also Deviant Tastes dirty food re-nerf. (#82562) ## About The Pull Request - Adds Strong Stomach quirk. - 4 points - You can eat dirty food without risk of getting disease. - You suffer less negative effects from vomiting. Vomit stuns you for half the duration, and you lose half as much nutrition. - Reverts https://github.com/tgstation/tgstation/pull/76864 , integrates its effects into Strong Stomach instead. ## Why It's Good For The Game - Lotta people (namely Lizards and sometimes Felines with Deviant Tastes) run gimmicks involving them being a gremlin person and eating trash off the ground, and it's rather hard to accomplish this now since it makes you a public medbay enemy # 1. This quirk should give them an option to avoid that. - Also (as mentioned in the title) both CDDA and PZ have this trait and I can't believe we're missing it! This is something in modifiable-character-traits/quirks-101. - I moved the effects from #76864 to this quirk because 1. I thought it was more fitting and 2. I thought the original PR was kinda wack for what is (generally) a neutral quirk. ## Changelog 🆑 Melbert add: Adds the Strong Stomach quirk, which allows you to eat grimy food without worry about disease, and makes you a bit more resilient to the effects of vomiting. del: Deviant Tastes no longer prevents you from getting a negative moodlet from eating dirty food. Strong Stomach does that now. /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> * Remove several functions from collections.js which have ES5 equivalents (#82417) * Makes it EVEN EASIER to work with atom item interactions ft. "Leaf and Branch" & "Death to Chains" (#82625) * apc fix * Gulag Adjustments Two (#82561) ## About The Pull Request I have received feedback that after the prior changes in #81971, the gulag is still a little bit too subject to RNG. The main culprit (as in my previous PR) is Iron being kind of cheap and the fact that unlike the old Gulag you no longer have any way of headhunting more valuable materials (everything appears as boulders on your ore scanner). My solution to this is wider than the last one of tweaking point values, but also much simpler: Just make every boulder you mine be worth the same amount of points regardless of what is inside of it. On the average test I made I could comfortably mine about 40-45 boulders in ten minutes. We'll make some adjustments to that rather than leaving 40 as the target number; Most players upon being teleported to the gulag are going to spend a few minutes whining and bemoaning their fate instead of getting straight to work. I had the benefit of being able to make sure my run started as soon as a storm ended so I wouldn't need any kind of midpoint break. I was also always the only person playing on my local instance, there hadn't been any other pesky prisoners before me who had already mined out all the nearest available deposits. And of course, let us not forget, I am an MLG master league ss13 player who was surely performing well above average. So we'll round that down to: Each boulder is worth 33 points, meaning you need to collect 31 boulders to complete a 1000 point (roughly ten minute) sentence. How do I ensure that every boulder is worth the same amount of points? Well it's pretty easy. One boulder = one material sheet. One material sheet = 33 points. Simple. "Now Jacquerel", I hear you not saying because you don't want me to know about this thing you would prefer to do instead of hitting rocks outside; "if I simply smash all of the tables and microwaves and botany trays and bed in the gulag I can easily get like 65 sheets of Iron, which is almost enough to buy the freedom for two entire people!" Unfortunately I knew you were going to try and do that and the prisoner point machine will only give you points for material sheets which have been printed from the material smelter (well, any material smelter actually but you should probably use the one in the gulag). You'll be able to tell because if you examine a valid material sheet it will mention a little maker's mark on it, which is absent in the beat-up iron that you get from smashing furniture to bits. Also glass is worth 0 points. Don't waste time digging up that shit. As glass has had all of its point value removed, I have added a "work pit" to the gulag to compensate. You can pull boulders out of this indefinitely via effort, however it also stamcrits you every time. It's not very fun to do this, but that's because I would prefer you to go find the rocks out in the field instead. This is a last resort. You can do this if there's no boulders left to mine or if you really really really hate mining and would rather very slowly click on one tile repeatedly to get your boulders instead. As a tiny bonus doing this gives workout experience. This isn't a totally ideal solution but I think it'll do for now. ## Why It's Good For The Game What we want out of the gulag is: - Something where officers can vaguely approximate an expected sentence duration. - A task that requires players to actually be spending that time doing something to get out of here. - Produces at least some amount of useful materials. In I think roughly that order. I hope this change accomplishes all three of these in a way that is somewhat predictable rather than throwing darts at a board. ## Changelog 🆑 balance: Gulag mining has been rebalanced so that every boulder is worth the same amount of points to mine for a prisoner regardless of what it contains, and should be more consistent. add: A vent which boulders can be hauled out of by hand has been added to the gulag which you can use if there's nothing left to mine. It is very slow, but at least it gives you a workout... /🆑 * stone * Makes test merge bot continue with other PRs if updating one fails. (#82717) Right now updating https://github.com/tgstation/tgstation/pull/81089#issuecomment-1907296233 fails because it exceeds github character limit for comments. This will make it work until backed is updated. * Fixes the RnD console by adding a removed import (#82750) ## About The Pull Request The 'map' import was removed from this file by #82417 but it's still used in place in code. This re-adds the import ## Why It's Good For The Game Fixes RnD consoles ## Changelog 🆑 fix: Fixed RnD consoles not being able to be opened. /🆑 Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com> * Fixes cargo import (#82755) ## About The Pull Request One of the imports got removed and there were no warnings... Man if only there were a technology that could warn us in advance ## Why It's Good For The Game UI fixes ## Changelog 🆑 fix: Fixed a bluescreen in cargo console /🆑 * fixes * Fixes, fixes. * Pre-emptive mirror of https://github.com/tgstation/tgstation/pull/82892 * Turf weakref persists in changeturf / Fix plasma cutters (#82906) ## About The Pull Request Turf references don't change so logically, turf weakrefs wouldn't change if the turf changes. By not doing this this can cause bugs: See #82886 . (This Fixes #82886) (Projectiles hold a list of weakrefs to atoms hit to determine what they have already hit. Because turf weakrefs reset, we could "hit" the same turf twice if it destroyed the turf. Old behavior - this was fine but now that they're weakrefs, we get two weakref datums in the list that point to the same ref.) Less hacky alternative to #82901 . (Closes #82901) ## Changelog 🆑 Melbert fix: Plasma cutters work again /🆑 --------- Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Interception&? <137328283+intercepti0n@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com> Co-authored-by: Ketrai <zottielolly@gmail.com> Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: AnturK <AnturK@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Iajret <8430839+Iajret@users.noreply.github.com> Co-authored-by: vect0r <71346830+Vect0r2@users.noreply.github.com> Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> Co-authored-by: AMyriad <143908044+AMyriad@users.noreply.github.com> Co-authored-by: Zytolg <33048583+Zytolg@users.noreply.github.com> Co-authored-by: Xackii <120736708+Xackii@users.noreply.github.com> Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: Mal <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com> Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com> Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com> Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
1285 lines
51 KiB
Plaintext
1285 lines
51 KiB
Plaintext
////////////
|
|
//SECURITY//
|
|
////////////
|
|
|
|
GLOBAL_LIST_INIT(blacklisted_builds, list(
|
|
"1622" = "Bug breaking rendering can lead to wallhacks.",
|
|
))
|
|
|
|
#define LIMITER_SIZE 5
|
|
#define CURRENT_SECOND 1
|
|
#define SECOND_COUNT 2
|
|
#define CURRENT_MINUTE 3
|
|
#define MINUTE_COUNT 4
|
|
#define ADMINSWARNED_AT 5
|
|
/*
|
|
When somebody clicks a link in game, this Topic is called first.
|
|
It does the stuff in this proc and then is redirected to the Topic() proc for the src=[0xWhatever]
|
|
(if specified in the link). ie locate(hsrc).Topic()
|
|
|
|
Such links can be spoofed.
|
|
|
|
Because of this certain things MUST be considered whenever adding a Topic() for something:
|
|
- Can it be fed harmful values which could cause runtimes?
|
|
- Is the Topic call an admin-only thing?
|
|
- If so, does it have checks to see if the person who called it (usr.client) is an admin?
|
|
- Are the processes being called by Topic() particularly laggy?
|
|
- If so, is there any protection against somebody spam-clicking a link?
|
|
If you have any questions about this stuff feel free to ask. ~Carn
|
|
*/
|
|
|
|
//the undocumented 4th argument is for ?[0x\ref] style topic links. hsrc is set to the reference and anything after the ] gets put into hsrc_command
|
|
/client/Topic(href, href_list, hsrc, hsrc_command)
|
|
if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null
|
|
return
|
|
//SKYRAT EDIT ADDITION BEGIN - MENTOR
|
|
if(mentor_client_procs(href_list))
|
|
return
|
|
//SKYRAT EDIT ADDITION END
|
|
|
|
#ifndef TESTING
|
|
if (LOWER_TEXT(hsrc_command) == "_debug") //disable the integrated byond vv in the client side debugging tools since it doesn't respect vv read protections
|
|
return
|
|
#endif
|
|
|
|
// asset_cache
|
|
var/asset_cache_job
|
|
if(href_list["asset_cache_confirm_arrival"])
|
|
asset_cache_job = asset_cache_confirm_arrival(href_list["asset_cache_confirm_arrival"])
|
|
if (!asset_cache_job)
|
|
return
|
|
|
|
// Rate limiting
|
|
var/mtl = CONFIG_GET(number/minute_topic_limit)
|
|
if (!holder && mtl)
|
|
var/minute = round(world.time, 600)
|
|
if (!topiclimiter)
|
|
topiclimiter = new(LIMITER_SIZE)
|
|
if (minute != topiclimiter[CURRENT_MINUTE])
|
|
topiclimiter[CURRENT_MINUTE] = minute
|
|
topiclimiter[MINUTE_COUNT] = 0
|
|
topiclimiter[MINUTE_COUNT] += 1
|
|
if (topiclimiter[MINUTE_COUNT] > mtl)
|
|
var/msg = "Your previous action was ignored because you've done too many in a minute."
|
|
if (minute != topiclimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them)
|
|
topiclimiter[ADMINSWARNED_AT] = minute
|
|
msg += " Administrators have been informed."
|
|
log_game("[key_name(src)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute")
|
|
message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute")
|
|
to_chat(src, span_danger("[msg]"))
|
|
return
|
|
|
|
var/stl = CONFIG_GET(number/second_topic_limit)
|
|
if (!holder && stl && href_list["window_id"] != "statbrowser")
|
|
var/second = round(world.time, 10)
|
|
if (!topiclimiter)
|
|
topiclimiter = new(LIMITER_SIZE)
|
|
if (second != topiclimiter[CURRENT_SECOND])
|
|
topiclimiter[CURRENT_SECOND] = second
|
|
topiclimiter[SECOND_COUNT] = 0
|
|
topiclimiter[SECOND_COUNT] += 1
|
|
if (topiclimiter[SECOND_COUNT] > stl)
|
|
to_chat(src, span_danger("Your previous action was ignored because you've done too many in a second"))
|
|
return
|
|
|
|
// Tgui Topic middleware
|
|
if(tgui_Topic(href_list))
|
|
return
|
|
if(href_list["reload_tguipanel"])
|
|
nuke_chat()
|
|
if(href_list["reload_statbrowser"])
|
|
stat_panel.reinitialize()
|
|
// Log all hrefs
|
|
log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]")
|
|
|
|
//byond bug ID:2256651
|
|
if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
|
|
to_chat(src, span_danger("An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)"))
|
|
src << browse("...", "window=asset_cache_browser")
|
|
return
|
|
if (href_list["asset_cache_preload_data"])
|
|
asset_cache_preload_data(href_list["asset_cache_preload_data"])
|
|
return
|
|
|
|
// Admin PM
|
|
if(href_list["priv_msg"])
|
|
cmd_admin_pm(href_list["priv_msg"],null)
|
|
return
|
|
if (href_list["player_ticket_panel"])
|
|
view_latest_ticket()
|
|
return
|
|
// Admin message
|
|
if(href_list["messageread"])
|
|
var/message_id = round(text2num(href_list["messageread"]), 1)
|
|
if(!isnum(message_id))
|
|
return
|
|
var/datum/db_query/query_message_read = SSdbcore.NewQuery(
|
|
"UPDATE [format_table_name("messages")] SET type = 'message sent' WHERE targetckey = :player_key AND id = :id",
|
|
list("id" = message_id, "player_key" = usr.ckey)
|
|
)
|
|
query_message_read.warn_execute()
|
|
return
|
|
|
|
// TGUIless adminhelp
|
|
if(href_list["tguiless_adminhelp"])
|
|
no_tgui_adminhelp(input(src, "Enter your ahelp", "Ahelp") as null|message)
|
|
return
|
|
|
|
switch(href_list["_src_"])
|
|
if("holder")
|
|
hsrc = holder
|
|
if("usr")
|
|
hsrc = mob
|
|
if("vars")
|
|
return view_var_Topic(href,href_list,hsrc)
|
|
|
|
switch(href_list["action"])
|
|
if("openLink")
|
|
src << link(href_list["link"])
|
|
if (hsrc)
|
|
var/datum/real_src = hsrc
|
|
if(QDELETED(real_src))
|
|
return
|
|
|
|
//fun fact: Topic() acts like a verb and is executed at the end of the tick like other verbs. So we have to queue it if the server is
|
|
//overloaded
|
|
if(hsrc && hsrc != holder && DEFAULT_TRY_QUEUE_VERB(VERB_CALLBACK(src, PROC_REF(_Topic), hsrc, href, href_list)))
|
|
return
|
|
..() //redirect to hsrc.Topic()
|
|
|
|
///dumb workaround because byond doesnt seem to recognize the Topic() typepath for /datum/proc/Topic() from the client Topic,
|
|
///so we cant queue it without this
|
|
/client/proc/_Topic(datum/hsrc, href, list/href_list)
|
|
return hsrc.Topic(href, href_list)
|
|
|
|
/client/proc/is_content_unlocked()
|
|
if(!prefs.unlock_content)
|
|
to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Only 10 bucks for 3 months! <a href=\"https://secure.byond.com/membership\">Click Here to find out more</a>.")
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/client/proc/is_localhost()
|
|
var/static/localhost_addresses = list(
|
|
"127.0.0.1",
|
|
"::1",
|
|
null,
|
|
)
|
|
return address in localhost_addresses
|
|
|
|
/*
|
|
* Call back proc that should be checked in all paths where a client can send messages
|
|
*
|
|
* Handles checking for duplicate messages and people sending messages too fast
|
|
*
|
|
* The first checks are if you're sending too fast, this is defined as sending
|
|
* SPAM_TRIGGER_AUTOMUTE messages in
|
|
* 5 seconds, this will start supressing your messages,
|
|
* if you send 2* that limit, you also get muted
|
|
*
|
|
* The second checks for the same duplicate message too many times and mutes
|
|
* you for it
|
|
*/
|
|
/client/proc/handle_spam_prevention(message, mute_type)
|
|
|
|
//Increment message count
|
|
total_message_count += 1
|
|
|
|
//store the total to act on even after a reset
|
|
var/cache = total_message_count
|
|
|
|
if(total_count_reset <= world.time)
|
|
total_message_count = 0
|
|
total_count_reset = world.time + (5 SECONDS)
|
|
|
|
//If they're really going crazy, mute them
|
|
if(cache >= SPAM_TRIGGER_AUTOMUTE * 2)
|
|
total_message_count = 0
|
|
total_count_reset = 0
|
|
cmd_admin_mute(src, mute_type, 1)
|
|
return TRUE
|
|
|
|
//Otherwise just supress the message
|
|
else if(cache >= SPAM_TRIGGER_AUTOMUTE)
|
|
return TRUE
|
|
|
|
|
|
if(CONFIG_GET(flag/automute_on) && !holder && last_message == message)
|
|
if(SEND_SIGNAL(mob, COMSIG_MOB_AUTOMUTE_CHECK, src, last_message, mute_type) & WAIVE_AUTOMUTE_CHECK)
|
|
return FALSE
|
|
|
|
src.last_message_count++
|
|
if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE)
|
|
to_chat(src, span_danger("You have exceeded the spam filter limit for identical messages. A mute was automatically applied for the current round. Contact admins to request its removal."))
|
|
cmd_admin_mute(src, mute_type, 1)
|
|
return TRUE
|
|
if(src.last_message_count >= SPAM_TRIGGER_WARNING)
|
|
//"auto-ban" sends the message that the cold and uncaring gamecode has been designed to quiash you like a bug in short measure should you continue, and it's quite intentional that the user isn't told exactly what that entails.
|
|
to_chat(src, span_danger("You are nearing the auto-ban limit for identical messages."))
|
|
return FALSE
|
|
else
|
|
last_message = message
|
|
src.last_message_count = 0
|
|
return FALSE
|
|
|
|
//This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc.
|
|
/client/AllowUpload(filename, filelength)
|
|
var/client_max_file_size = CONFIG_GET(number/upload_limit)
|
|
if (holder)
|
|
var/admin_max_file_size = CONFIG_GET(number/upload_limit_admin)
|
|
if(filelength > admin_max_file_size)
|
|
to_chat(src, span_warning("Error: AllowUpload(): File Upload too large. Upload Limit: [admin_max_file_size/1024]KiB."))
|
|
return FALSE
|
|
else if(filelength > client_max_file_size)
|
|
to_chat(src, span_warning("Error: AllowUpload(): File Upload too large. Upload Limit: [client_max_file_size/1024]KiB."))
|
|
return FALSE
|
|
return TRUE
|
|
|
|
|
|
///////////
|
|
//CONNECT//
|
|
///////////
|
|
|
|
/client/New(TopicData)
|
|
var/tdata = TopicData //save this for later use
|
|
TopicData = null //Prevent calls to client.Topic from connect
|
|
|
|
if(connection != "seeker" && connection != "web")//Invalid connection type.
|
|
return null
|
|
|
|
GLOB.clients += src
|
|
GLOB.directory[ckey] = src
|
|
|
|
// Instantiate stat panel
|
|
stat_panel = new(src, "statbrowser")
|
|
stat_panel.subscribe(src, PROC_REF(on_stat_panel_message))
|
|
|
|
// Instantiate tgui panel
|
|
tgui_panel = new(src, "browseroutput")
|
|
|
|
tgui_say = new(src, "tgui_say")
|
|
|
|
set_right_click_menu_mode(TRUE)
|
|
|
|
GLOB.ahelp_tickets.ClientLogin(src)
|
|
GLOB.interviews.client_login(src)
|
|
GLOB.requests.client_login(src)
|
|
//preferences datum - also holds some persistent data for the client (because we may as well keep these datums to a minimum)
|
|
prefs = GLOB.preferences_datums[ckey]
|
|
if(prefs)
|
|
prefs.parent = src
|
|
prefs.load_savefile() // just to make sure we have the latest data
|
|
prefs.apply_all_client_preferences()
|
|
else
|
|
prefs = new /datum/preferences(src)
|
|
GLOB.preferences_datums[ckey] = prefs
|
|
prefs.last_ip = address //these are gonna be used for banning
|
|
prefs.last_id = computer_id //these are gonna be used for banning
|
|
|
|
if(fexists(roundend_report_file()))
|
|
add_verb(src, /client/proc/show_previous_roundend_report)
|
|
|
|
if(fexists("data/server_last_roundend_report.html"))
|
|
add_verb(src, /client/proc/show_servers_last_roundend_report)
|
|
|
|
var/full_version = "[byond_version].[byond_build ? byond_build : "xxx"]"
|
|
log_access("Login: [key_name(src)] from [address ? address : "localhost"]-[computer_id] || BYOND v[full_version]")
|
|
|
|
var/alert_mob_dupe_login = FALSE
|
|
var/alert_admin_multikey = FALSE
|
|
if(CONFIG_GET(flag/log_access))
|
|
var/list/joined_players = list()
|
|
for(var/player_ckey in GLOB.joined_player_list)
|
|
joined_players[player_ckey] = 1
|
|
|
|
for(var/joined_player_ckey in (GLOB.directory | joined_players))
|
|
if (!joined_player_ckey || joined_player_ckey == ckey)
|
|
continue
|
|
|
|
var/datum/preferences/joined_player_preferences = GLOB.preferences_datums[joined_player_ckey]
|
|
if(!joined_player_preferences)
|
|
continue //this shouldn't happen.
|
|
|
|
var/client/C = GLOB.directory[joined_player_ckey]
|
|
var/in_round = ""
|
|
if (joined_players[joined_player_ckey])
|
|
in_round = " who has played in the current round"
|
|
var/message_type = "Notice"
|
|
|
|
var/matches
|
|
if(joined_player_preferences.last_ip == address)
|
|
matches += "IP ([address])"
|
|
if(joined_player_preferences.last_id == computer_id)
|
|
if(matches)
|
|
matches = "BOTH [matches] and "
|
|
alert_admin_multikey = TRUE
|
|
message_type = "MULTIKEY"
|
|
matches += "Computer ID ([computer_id])"
|
|
alert_mob_dupe_login = TRUE
|
|
|
|
if(matches)
|
|
if(C)
|
|
message_admins(span_danger("<B>[message_type]: </B></span><span class='notice'>Connecting player [key_name_admin(src)] has the same [matches] as [key_name_admin(C)]<b>[in_round]</b>."))
|
|
log_admin_private("[message_type]: Connecting player [key_name(src)] has the same [matches] as [key_name(C)][in_round].")
|
|
else
|
|
message_admins(span_danger("<B>[message_type]: </B></span><span class='notice'>Connecting player [key_name_admin(src)] has the same [matches] as [joined_player_ckey](no longer logged in)<b>[in_round]</b>. "))
|
|
log_admin_private("[message_type]: Connecting player [key_name(src)] has the same [matches] as [joined_player_ckey](no longer logged in)[in_round].")
|
|
var/reconnecting = FALSE
|
|
if(GLOB.player_details[ckey])
|
|
reconnecting = TRUE
|
|
player_details = GLOB.player_details[ckey]
|
|
player_details.byond_version = full_version
|
|
else
|
|
player_details = new(ckey)
|
|
player_details.byond_version = full_version
|
|
GLOB.player_details[ckey] = player_details
|
|
|
|
|
|
. = ..() //calls mob.Login()
|
|
|
|
// Admin Verbs need the client's mob to exist. Must be after ..()
|
|
var/connecting_admin = FALSE //because de-admined admins connecting should be treated like admins.
|
|
//Admin Authorisation
|
|
var/datum/admins/admin_datum = GLOB.admin_datums[ckey]
|
|
if (!isnull(admin_datum))
|
|
admin_datum.associate(src)
|
|
connecting_admin = TRUE
|
|
else if(GLOB.deadmins[ckey])
|
|
add_verb(src, /client/proc/readmin)
|
|
connecting_admin = TRUE
|
|
//SKYRAT EDIT ADDITION //We will check the population here, because we need to know if the client is an admin or not.
|
|
if(!check_population(connecting_admin))
|
|
qdel(src)
|
|
return
|
|
// SKYRAT EDIT END
|
|
if(CONFIG_GET(flag/autoadmin))
|
|
if(!GLOB.admin_datums[ckey])
|
|
var/list/autoadmin_ranks = ranks_from_rank_name(CONFIG_GET(string/autoadmin_rank))
|
|
if (autoadmin_ranks.len == 0)
|
|
to_chat(world, "Autoadmin rank not found")
|
|
else
|
|
new /datum/admins(autoadmin_ranks, ckey)
|
|
|
|
if(CONFIG_GET(flag/enable_localhost_rank) && !connecting_admin && is_localhost())
|
|
var/datum/admin_rank/localhost_rank = new("!localhost!", R_EVERYTHING, R_DBRANKS, R_EVERYTHING) //+EVERYTHING -DBRANKS *EVERYTHING
|
|
new /datum/admins(list(localhost_rank), ckey, 1, 1)
|
|
|
|
if (length(GLOB.stickybanadminexemptions))
|
|
GLOB.stickybanadminexemptions -= ckey
|
|
if (!length(GLOB.stickybanadminexemptions))
|
|
restore_stickybans()
|
|
|
|
if (byond_version >= 512)
|
|
if (!byond_build || byond_build < 1386)
|
|
message_admins(span_adminnotice("[key_name(src)] has been detected as spoofing their byond version. Connection rejected."))
|
|
add_system_note("Spoofed-Byond-Version", "Detected as using a spoofed byond version.")
|
|
log_suspicious_login("Failed Login: [key] - Spoofed byond version")
|
|
qdel(src)
|
|
|
|
if (num2text(byond_build) in GLOB.blacklisted_builds)
|
|
log_access("Failed login: [key] - blacklisted byond version")
|
|
to_chat_immediate(src, span_userdanger("Your version of byond is blacklisted."))
|
|
to_chat_immediate(src, span_danger("Byond build [byond_build] ([byond_version].[byond_build]) has been blacklisted for the following reason: [GLOB.blacklisted_builds[num2text(byond_build)]]."))
|
|
to_chat_immediate(src, span_danger("Please download a new version of byond. If [byond_build] is the latest, you can go to <a href=\"https://secure.byond.com/download/build\">BYOND's website</a> to download other versions."))
|
|
if(connecting_admin)
|
|
to_chat_immediate(src, "As an admin, you are being allowed to continue using this version, but please consider changing byond versions")
|
|
else
|
|
qdel(src)
|
|
return
|
|
|
|
if(SSinput.initialized)
|
|
set_macros()
|
|
|
|
// Initialize stat panel
|
|
stat_panel.initialize(
|
|
inline_html = file("html/statbrowser.html"),
|
|
inline_js = file("html/statbrowser.js"),
|
|
inline_css = file("html/statbrowser.css"),
|
|
)
|
|
addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 30 SECONDS)
|
|
|
|
// Initialize tgui panel
|
|
tgui_panel.initialize()
|
|
|
|
tgui_say.initialize()
|
|
|
|
if(alert_mob_dupe_login && !holder)
|
|
var/dupe_login_message = "Your ComputerID has already logged in with another key this round, please log out of this one NOW or risk being banned!"
|
|
if (alert_admin_multikey)
|
|
dupe_login_message += "\nAdmins have been informed."
|
|
message_admins(span_danger("<B>MULTIKEYING: </B></span><span class='notice'>[key_name_admin(src)] has a matching CID+IP with another player and is clearly multikeying. They have been warned to leave the server or risk getting banned."))
|
|
log_admin_private("MULTIKEYING: [key_name(src)] has a matching CID+IP with another player and is clearly multikeying. They have been warned to leave the server or risk getting banned.")
|
|
spawn(0.5 SECONDS) //needs to run during world init, do not convert to add timer
|
|
alert(mob, dupe_login_message) //players get banned if they don't see this message, do not convert to tgui_alert (or even tg_alert) please.
|
|
to_chat_immediate(mob, span_danger(dupe_login_message))
|
|
|
|
|
|
connection_time = world.time
|
|
connection_realtime = world.realtime
|
|
connection_timeofday = world.timeofday
|
|
winset(src, null, "command=\".configure graphics-hwmode on\"")
|
|
var/breaking_version = CONFIG_GET(number/client_error_version)
|
|
var/breaking_build = CONFIG_GET(number/client_error_build)
|
|
var/warn_version = CONFIG_GET(number/client_warn_version)
|
|
var/warn_build = CONFIG_GET(number/client_warn_build)
|
|
|
|
if (byond_version < breaking_version || (byond_version == breaking_version && byond_build < breaking_build)) //Out of date client.
|
|
to_chat_immediate(src, span_danger("<b>Your version of BYOND is too old:</b>"))
|
|
to_chat_immediate(src, CONFIG_GET(string/client_error_message))
|
|
to_chat_immediate(src, "Your version: [byond_version].[byond_build]")
|
|
to_chat_immediate(src, "Required version: [breaking_version].[breaking_build] or later")
|
|
to_chat_immediate(src, "Visit <a href=\"https://secure.byond.com/download\">BYOND's website</a> to get the latest version of BYOND.")
|
|
if (connecting_admin)
|
|
to_chat_immediate(src, "Because you are an admin, you are being allowed to walk past this limitation, But it is still STRONGLY suggested you upgrade")
|
|
else
|
|
qdel(src)
|
|
return
|
|
else if (byond_version < warn_version || (byond_version == warn_version && byond_build < warn_build)) //We have words for this client.
|
|
if(CONFIG_GET(flag/client_warn_popup))
|
|
var/msg = "<b>Your version of byond may be getting out of date:</b><br>"
|
|
msg += CONFIG_GET(string/client_warn_message) + "<br><br>"
|
|
msg += "Your version: [byond_version].[byond_build]<br>"
|
|
msg += "Required version to remove this message: [warn_version].[warn_build] or later<br>"
|
|
msg += "Visit <a href=\"https://secure.byond.com/download\">BYOND's website</a> to get the latest version of BYOND.<br>"
|
|
src << browse(msg, "window=warning_popup")
|
|
else
|
|
to_chat(src, span_danger("<b>Your version of byond may be getting out of date:</b>"))
|
|
to_chat(src, CONFIG_GET(string/client_warn_message))
|
|
to_chat(src, "Your version: [byond_version].[byond_build]")
|
|
to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later")
|
|
to_chat(src, "Visit <a href=\"https://secure.byond.com/download\">BYOND's website</a> to get the latest version of BYOND.")
|
|
|
|
if (connection == "web" && !connecting_admin)
|
|
if (!CONFIG_GET(flag/allow_webclient))
|
|
to_chat_immediate(src, "Web client is disabled")
|
|
qdel(src)
|
|
return
|
|
if (CONFIG_GET(flag/webclient_only_byond_members) && !IsByondMember())
|
|
to_chat_immediate(src, "Sorry, but the web client is restricted to byond members only.")
|
|
qdel(src)
|
|
return
|
|
|
|
if( (world.address == address || !address) && !GLOB.host )
|
|
GLOB.host = key
|
|
world.update_status()
|
|
|
|
if(holder)
|
|
add_admin_verbs()
|
|
display_admin_memos(src)
|
|
adminGreet()
|
|
if (mob && reconnecting)
|
|
var/stealth_admin = mob.client?.holder?.fakekey
|
|
var/announce_leave = mob.client?.prefs?.read_preference(/datum/preference/toggle/broadcast_login_logout)
|
|
if (!stealth_admin)
|
|
deadchat_broadcast(" has reconnected.", "<b>[mob][mob.get_realname_string()]</b>", follow_target = mob, turf_target = get_turf(mob), message_type = DEADCHAT_LOGIN_LOGOUT, admin_only=!announce_leave)
|
|
add_verbs_from_config()
|
|
|
|
// This needs to be before the client age from db is updated as it'll be updated by then.
|
|
var/datum/db_query/query_last_connected = SSdbcore.NewQuery(
|
|
"SELECT lastseen FROM [format_table_name("player")] WHERE ckey = :ckey",
|
|
list("ckey" = ckey)
|
|
)
|
|
if(query_last_connected.warn_execute() && length(query_last_connected.rows))
|
|
query_last_connected.NextRow()
|
|
var/time_stamp = query_last_connected.item[1]
|
|
display_unread_notes(src, time_stamp)
|
|
qdel(query_last_connected)
|
|
|
|
var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need it's current value now down below.
|
|
if (isnum(cached_player_age) && cached_player_age == -1) //first connection
|
|
player_age = 0
|
|
var/nnpa = CONFIG_GET(number/notify_new_player_age)
|
|
if (isnum(cached_player_age) && cached_player_age == -1) //first connection
|
|
if (nnpa >= 0)
|
|
log_admin_private("New login: [key_name(key, FALSE, TRUE)] (IP: [address], ID: [computer_id]) logged onto the servers for the first time.")
|
|
message_admins("New user: [key_name_admin(src)] is connecting here for the first time.")
|
|
if (CONFIG_GET(flag/irc_first_connection_alert))
|
|
var/new_player_alert_role = CONFIG_GET(string/new_player_alert_role_id)
|
|
send2tgs_adminless_only(
|
|
"New-user",
|
|
"[key_name(src)] is connecting for the first time![new_player_alert_role ? " <@&[new_player_alert_role]>" : ""]"
|
|
)
|
|
else if (isnum(cached_player_age) && cached_player_age < nnpa)
|
|
message_admins("New user: [key_name_admin(src)] just connected with an age of [cached_player_age] day[(player_age == 1?"":"s")]")
|
|
if(CONFIG_GET(flag/use_account_age_for_jobs) && account_age >= 0)
|
|
player_age = account_age
|
|
if(account_age >= 0 && account_age < nnpa)
|
|
message_admins("[key_name_admin(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age == 1?"":"s")] old, created on [account_join_date].")
|
|
if (CONFIG_GET(flag/irc_first_connection_alert))
|
|
var/new_player_alert_role = CONFIG_GET(string/new_player_alert_role_id)
|
|
send2tgs_adminless_only(
|
|
"new_byond_user",
|
|
"[key_name(src)] (IP: [address], ID: [computer_id]) is a new BYOND account [account_age] day[(account_age == 1?"":"s")] old, created on [account_join_date].[new_player_alert_role ? " <@&[new_player_alert_role]>" : ""]"
|
|
)
|
|
scream_about_watchlists(src)
|
|
check_ip_intel()
|
|
validate_key_in_db()
|
|
// If we aren't already generating a ban cache, fire off a build request
|
|
// This way hopefully any users of request_ban_cache will never need to yield
|
|
if(!ban_cache_start && SSban_cache?.query_started)
|
|
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(build_ban_cache), src)
|
|
|
|
send_resources()
|
|
|
|
apply_clickcatcher()
|
|
|
|
if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates.
|
|
to_chat(src, span_info("You have unread updates in the changelog."))
|
|
if(CONFIG_GET(flag/aggressive_changelog))
|
|
changelog()
|
|
else
|
|
winset(src, "infowindow.changelog", "font-style=bold")
|
|
|
|
if(ckey in GLOB.clientmessages)
|
|
for(var/message in GLOB.clientmessages[ckey])
|
|
to_chat(src, message)
|
|
GLOB.clientmessages.Remove(ckey)
|
|
|
|
if(CONFIG_GET(flag/autoconvert_notes))
|
|
convert_notes_sql(ckey)
|
|
display_admin_messages(src)
|
|
if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
|
|
to_chat(src, span_warning("Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you."))
|
|
|
|
update_ambience_pref()
|
|
|
|
//This is down here because of the browse() calls in tooltip/New()
|
|
if(!tooltips)
|
|
tooltips = new /datum/tooltip(src)
|
|
|
|
if (!interviewee)
|
|
initialize_menus()
|
|
|
|
loot_panel = new(src)
|
|
|
|
view_size = new(src, getScreenSize(prefs.read_preference(/datum/preference/toggle/widescreen)))
|
|
view_size.resetFormat()
|
|
view_size.setZoomMode()
|
|
Master.UpdateTickRate()
|
|
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CLIENT_CONNECT, src)
|
|
fully_created = TRUE
|
|
|
|
//////////////
|
|
//DISCONNECT//
|
|
//////////////
|
|
|
|
/client/Del()
|
|
if(!gc_destroyed)
|
|
gc_destroyed = world.time
|
|
if (!QDELING(src))
|
|
stack_trace("Client does not purport to be QDELING, this is going to cause bugs in other places!")
|
|
|
|
// Yes this is the same as what's found in qdel(). Yes it does need to be here
|
|
// Get off my back
|
|
SEND_SIGNAL(src, COMSIG_QDELETING, TRUE)
|
|
Destroy() //Clean up signals and timers.
|
|
return ..()
|
|
|
|
/client/Destroy()
|
|
if(mob)
|
|
var/stealth_admin = mob.client?.holder?.fakekey
|
|
var/announce_join = mob.client?.prefs?.read_preference(/datum/preference/toggle/broadcast_login_logout)
|
|
if (!stealth_admin)
|
|
deadchat_broadcast(" has disconnected.", "<b>[mob][mob.get_realname_string()]</b>", follow_target = mob, turf_target = get_turf(mob), message_type = DEADCHAT_LOGIN_LOGOUT, admin_only=!announce_join)
|
|
mob.become_uncliented()
|
|
|
|
GLOB.clients -= src
|
|
GLOB.directory -= ckey
|
|
log_access("Logout: [key_name(src)]")
|
|
GLOB.ahelp_tickets.ClientLogout(src)
|
|
GLOB.interviews.client_logout(src)
|
|
GLOB.requests.client_logout(src)
|
|
SSserver_maint.UpdateHubStatus()
|
|
if(credits)
|
|
QDEL_LIST(credits)
|
|
if(holder)
|
|
adminGreet(1)
|
|
holder.owner = null
|
|
GLOB.admins -= src
|
|
if (!GLOB.admins.len && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
|
|
var/cheesy_message = pick(
|
|
"I have no admins online!",\
|
|
"I'm all alone :(",\
|
|
"I'm feeling lonely :(",\
|
|
"I'm so lonely :(",\
|
|
"Why does nobody love me? :(",\
|
|
"I want a man :(",\
|
|
"Where has everyone gone?",\
|
|
"I need a hug :(",\
|
|
"Someone come hold me :(",\
|
|
"I need someone on me :(",\
|
|
"What happened? Where has everyone gone?",\
|
|
"Forever alone :("\
|
|
)
|
|
|
|
send2adminchat("Server", "[cheesy_message] (No admins online)")
|
|
QDEL_LIST_ASSOC_VAL(char_render_holders)
|
|
|
|
SSambience.remove_ambience_client(src)
|
|
SSmouse_entered.hovers -= src
|
|
SSping.currentrun -= src
|
|
QDEL_NULL(view_size)
|
|
QDEL_NULL(void)
|
|
QDEL_NULL(tooltips)
|
|
QDEL_NULL(open_loadout_ui) //SKYRAT EDIT ADDITION
|
|
QDEL_NULL(loot_panel)
|
|
seen_messages = null
|
|
Master.UpdateTickRate()
|
|
..() //Even though we're going to be hard deleted there are still some things that want to know the destroy is happening
|
|
return QDEL_HINT_HARDDEL_NOW
|
|
|
|
/client/proc/set_client_age_from_db(connectiontopic)
|
|
if (is_guest_key(src.key))
|
|
return
|
|
if(!SSdbcore.Connect())
|
|
return
|
|
var/datum/db_query/query_get_related_ip = SSdbcore.NewQuery(
|
|
"SELECT ckey FROM [format_table_name("player")] WHERE ip = INET_ATON(:address) AND ckey != :ckey",
|
|
list("address" = address, "ckey" = ckey)
|
|
)
|
|
if(!query_get_related_ip.Execute())
|
|
qdel(query_get_related_ip)
|
|
return
|
|
related_accounts_ip = ""
|
|
while(query_get_related_ip.NextRow())
|
|
related_accounts_ip += "[query_get_related_ip.item[1]], "
|
|
qdel(query_get_related_ip)
|
|
var/datum/db_query/query_get_related_cid = SSdbcore.NewQuery(
|
|
"SELECT ckey FROM [format_table_name("player")] WHERE computerid = :computerid AND ckey != :ckey",
|
|
list("computerid" = computer_id, "ckey" = ckey)
|
|
)
|
|
if(!query_get_related_cid.Execute())
|
|
qdel(query_get_related_cid)
|
|
return
|
|
related_accounts_cid = ""
|
|
while (query_get_related_cid.NextRow())
|
|
related_accounts_cid += "[query_get_related_cid.item[1]], "
|
|
qdel(query_get_related_cid)
|
|
var/admin_rank = holder?.rank_names() || "Player"
|
|
var/new_player
|
|
var/datum/db_query/query_client_in_db = SSdbcore.NewQuery(
|
|
"SELECT 1 FROM [format_table_name("player")] WHERE ckey = :ckey",
|
|
list("ckey" = ckey)
|
|
)
|
|
if(!query_client_in_db.Execute())
|
|
qdel(query_client_in_db)
|
|
return
|
|
/*
|
|
var/client_is_in_db = query_client_in_db.NextRow()
|
|
// If we aren't an admin, and the flag is set (the panic bunker is enabled).
|
|
if(CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey])
|
|
// The amount of hours needed to bypass the panic bunker.
|
|
var/living_recs = CONFIG_GET(number/panic_bunker_living)
|
|
// This relies on prefs existing, but this proc is only called after that occurs, so we're fine.
|
|
var/minutes = get_exp_living(pure_numeric = TRUE)
|
|
|
|
// Check to see if our client should be rejected.
|
|
// If interviews are on, we should let anyone through, ideally.
|
|
if(!CONFIG_GET(flag/panic_bunker_interview))
|
|
// If we don't have panic_bunker_living set and the client is not in the DB, reject them.
|
|
// Otherwise, if we do have a panic_bunker_living set, check if they have enough minutes played.
|
|
if((living_recs == 0 && !client_is_in_db) || living_recs >= minutes)
|
|
var/reject_message = "Failed Login: [key] - [client_is_in_db ? "":"New "]Account attempting to connect during panic bunker, but\
|
|
[living_recs == 0 ? " was rejected due to no prior connections to game servers (no database entry)":" they do not have the required living time [minutes]/[living_recs]"]."
|
|
log_access(reject_message)
|
|
message_admins(span_adminnotice("[reject_message]"))
|
|
var/message = CONFIG_GET(string/panic_bunker_message)
|
|
message = replacetext(message, "%minutes%", living_recs)
|
|
to_chat_immediate(src, message)
|
|
var/list/connectiontopic_a = params2list(connectiontopic)
|
|
var/list/panic_addr = CONFIG_GET(string/panic_server_address)
|
|
if(panic_addr && !connectiontopic_a["redirect"])
|
|
var/panic_name = CONFIG_GET(string/panic_server_name)
|
|
to_chat_immediate(src, span_notice("Sending you to [panic_name ? panic_name : panic_addr]."))
|
|
winset(src, null, "command=.options")
|
|
src << link("[panic_addr]?redirect=1")
|
|
qdel(query_client_in_db)
|
|
qdel(src)
|
|
return
|
|
*/
|
|
var/client_is_in_db = query_client_in_db.NextRow()
|
|
|
|
if(!client_is_in_db)
|
|
//SKYRAT EDIT ADDITION BEGIN - PANICBUNKER
|
|
if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
|
|
log_access("Failed Login: [key] - [address] - New account attempting to connect during panic bunker")
|
|
message_admins("<span class='adminnotice'>Failed Login: [key] - [address] - New account attempting to connect during panic bunker</span>")
|
|
to_chat_immediate(src, {"<span class='notice'>Hi! We have temporarily enabled safety measures that prevents new players from joining currently.<br>Please try again later, or contact a staff on Discord if you have any questions. <br> <br> To join our community, check out our Discord! To gain full access to our Discord, read the rules and post a request in the #access-requests channel under the \"Landing Zone\" category in the Discord server linked here: <a href='https://discord.gg/6RpdCgR'>https://discord.gg/6RpdCgR</a></span>"}) //skyrat-edit
|
|
var/list/connectiontopic_a = params2list(connectiontopic)
|
|
var/list/panic_addr = CONFIG_GET(string/panic_server_address)
|
|
if(panic_addr && !connectiontopic_a["redirect"])
|
|
var/panic_name = CONFIG_GET(string/panic_server_name)
|
|
to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")
|
|
winset(src, null, "command=.options")
|
|
src << link("[panic_addr]?redirect=1")
|
|
qdel(query_client_in_db)
|
|
qdel(src)
|
|
return
|
|
//SKYRAT EDIT END
|
|
new_player = 1
|
|
account_join_date = findJoinDate()
|
|
var/datum/db_query/query_add_player = SSdbcore.NewQuery({"
|
|
INSERT INTO [format_table_name("player")] (`ckey`, `byond_key`, `firstseen`, `firstseen_round_id`, `lastseen`, `lastseen_round_id`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`)
|
|
VALUES (:ckey, :key, Now(), :round_id, Now(), :round_id, INET_ATON(:ip), :computerid, :adminrank, :account_join_date)
|
|
"}, list("ckey" = ckey, "key" = key, "round_id" = GLOB.round_id, "ip" = address, "computerid" = computer_id, "adminrank" = admin_rank, "account_join_date" = account_join_date || null))
|
|
if(!query_add_player.Execute())
|
|
qdel(query_client_in_db)
|
|
qdel(query_add_player)
|
|
return
|
|
qdel(query_add_player)
|
|
if(!account_join_date)
|
|
account_join_date = "Error"
|
|
account_age = -1
|
|
//SKYRAT EDIT ADDITION BEGIN - PANICBUNKER
|
|
else if(ckey in GLOB.bunker_passthrough)
|
|
GLOB.bunker_passthrough -= ckey
|
|
//SKYRAT EDIT END
|
|
qdel(query_client_in_db)
|
|
var/datum/db_query/query_get_client_age = SSdbcore.NewQuery(
|
|
"SELECT firstseen, DATEDIFF(Now(),firstseen), accountjoindate, DATEDIFF(Now(),accountjoindate) FROM [format_table_name("player")] WHERE ckey = :ckey",
|
|
list("ckey" = ckey)
|
|
)
|
|
if(!query_get_client_age.Execute())
|
|
qdel(query_get_client_age)
|
|
return
|
|
if(query_get_client_age.NextRow())
|
|
player_join_date = query_get_client_age.item[1]
|
|
player_age = text2num(query_get_client_age.item[2])
|
|
if(!account_join_date)
|
|
account_join_date = query_get_client_age.item[3]
|
|
account_age = text2num(query_get_client_age.item[4])
|
|
if(!account_age)
|
|
account_join_date = findJoinDate()
|
|
if(!account_join_date)
|
|
account_age = -1
|
|
else
|
|
var/datum/db_query/query_datediff = SSdbcore.NewQuery(
|
|
"SELECT DATEDIFF(Now(), :account_join_date)",
|
|
list("account_join_date" = account_join_date)
|
|
)
|
|
if(!query_datediff.Execute())
|
|
qdel(query_datediff)
|
|
qdel(query_get_client_age)
|
|
return
|
|
if(query_datediff.NextRow())
|
|
account_age = text2num(query_datediff.item[1])
|
|
qdel(query_datediff)
|
|
qdel(query_get_client_age)
|
|
if(!new_player)
|
|
var/datum/db_query/query_log_player = SSdbcore.NewQuery(
|
|
"UPDATE [format_table_name("player")] SET lastseen = Now(), lastseen_round_id = :round_id, ip = INET_ATON(:ip), computerid = :computerid, lastadminrank = :admin_rank, accountjoindate = :account_join_date WHERE ckey = :ckey",
|
|
list("round_id" = GLOB.round_id, "ip" = address, "computerid" = computer_id, "admin_rank" = admin_rank, "account_join_date" = account_join_date || null, "ckey" = ckey)
|
|
)
|
|
if(!query_log_player.Execute())
|
|
qdel(query_log_player)
|
|
return
|
|
qdel(query_log_player)
|
|
if(!account_join_date)
|
|
account_join_date = "Error"
|
|
var/datum/db_query/query_log_connection = SSdbcore.NewQuery(/* SKYRAT EDIT CHANGE - MULTISERVER */{"
|
|
INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_name`,`server_ip`,`server_port`,`round_id`,`ckey`,`ip`,`computerid`)
|
|
VALUES(null,Now(),:server_name,INET_ATON(:internet_address),:port,:round_id,:ckey,INET_ATON(:ip),:computerid)
|
|
"}, list("server_name" = CONFIG_GET(string/serversqlname), "internet_address" = world.internet_address || "0", "port" = world.port, "round_id" = GLOB.round_id, "ckey" = ckey, "ip" = address, "computerid" = computer_id)) //SKYRAT EDIT CHANGE - MULTISERVER
|
|
query_log_connection.Execute()
|
|
qdel(query_log_connection)
|
|
|
|
SSserver_maint.UpdateHubStatus()
|
|
|
|
if(new_player)
|
|
player_age = -1
|
|
. = player_age
|
|
|
|
/client/proc/findJoinDate()
|
|
var/list/http = world.Export("http://byond.com/members/[ckey]?format=text")
|
|
if(!http)
|
|
log_world("Failed to connect to byond member page to age check [ckey]")
|
|
return
|
|
var/F = file2text(http["CONTENT"])
|
|
if(F)
|
|
var/regex/R = regex("joined = \"(\\d{4}-\\d{2}-\\d{2})\"")
|
|
if(R.Find(F))
|
|
. = R.group[1]
|
|
else
|
|
CRASH("Age check regex failed for [src.ckey]")
|
|
|
|
/client/proc/validate_key_in_db()
|
|
var/sql_key
|
|
var/datum/db_query/query_check_byond_key = SSdbcore.NewQuery(
|
|
"SELECT byond_key FROM [format_table_name("player")] WHERE ckey = :ckey",
|
|
list("ckey" = ckey)
|
|
)
|
|
if(!query_check_byond_key.Execute())
|
|
qdel(query_check_byond_key)
|
|
return
|
|
if(query_check_byond_key.NextRow())
|
|
sql_key = query_check_byond_key.item[1]
|
|
qdel(query_check_byond_key)
|
|
if(key != sql_key)
|
|
var/list/http = world.Export("http://byond.com/members/[ckey]?format=text")
|
|
if(!http)
|
|
log_world("Failed to connect to byond member page to get changed key for [ckey]")
|
|
return
|
|
var/F = file2text(http["CONTENT"])
|
|
if(F)
|
|
var/regex/R = regex("\\tkey = \"(.+)\"")
|
|
if(R.Find(F))
|
|
var/web_key = R.group[1]
|
|
var/datum/db_query/query_update_byond_key = SSdbcore.NewQuery(
|
|
"UPDATE [format_table_name("player")] SET byond_key = :byond_key WHERE ckey = :ckey",
|
|
list("byond_key" = web_key, "ckey" = ckey)
|
|
)
|
|
query_update_byond_key.Execute()
|
|
qdel(query_update_byond_key)
|
|
else
|
|
CRASH("Key check regex failed for [ckey]")
|
|
|
|
/client/proc/add_system_note(system_ckey, message)
|
|
//check to see if we noted them in the last day.
|
|
var/datum/db_query/query_get_notes = SSdbcore.NewQuery(
|
|
"SELECT id FROM [format_table_name("messages")] WHERE type = 'note' AND targetckey = :targetckey AND adminckey = :adminckey AND timestamp + INTERVAL 1 DAY < NOW() AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL)",
|
|
list("targetckey" = ckey, "adminckey" = system_ckey)
|
|
)
|
|
if(!query_get_notes.Execute())
|
|
qdel(query_get_notes)
|
|
return
|
|
if(query_get_notes.NextRow())
|
|
qdel(query_get_notes)
|
|
return
|
|
qdel(query_get_notes)
|
|
//regardless of above, make sure their last note is not from us, as no point in repeating the same note over and over.
|
|
query_get_notes = SSdbcore.NewQuery(
|
|
"SELECT adminckey FROM [format_table_name("messages")] WHERE targetckey = :targetckey AND deleted = 0 AND (expire_timestamp > NOW() OR expire_timestamp IS NULL) ORDER BY timestamp DESC LIMIT 1",
|
|
list("targetckey" = ckey)
|
|
)
|
|
if(!query_get_notes.Execute())
|
|
qdel(query_get_notes)
|
|
return
|
|
if(query_get_notes.NextRow())
|
|
if (query_get_notes.item[1] == system_ckey)
|
|
qdel(query_get_notes)
|
|
return
|
|
qdel(query_get_notes)
|
|
create_message("note", key, system_ckey, message, null, null, 0, 0, null, 0, 0)
|
|
|
|
|
|
/client/proc/check_ip_intel()
|
|
set waitfor = 0 //we sleep when getting the intel, no need to hold up the client connection while we sleep
|
|
if (CONFIG_GET(string/ipintel_email))
|
|
var/datum/ipintel/res = get_ip_intel(address)
|
|
if (res.intel >= CONFIG_GET(number/ipintel_rating_bad))
|
|
message_admins(span_adminnotice("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN."))
|
|
ip_intel = res.intel
|
|
|
|
/client/Click(atom/object, atom/location, control, params)
|
|
if(click_intercept_time)
|
|
if(click_intercept_time >= world.time)
|
|
click_intercept_time = 0 //Reset and return. Next click should work, but not this one.
|
|
return
|
|
click_intercept_time = 0 //Just reset. Let's not keep re-checking forever.
|
|
|
|
var/ab = FALSE
|
|
var/list/modifiers = params2list(params)
|
|
|
|
var/button_clicked = LAZYACCESS(modifiers, "button")
|
|
|
|
var/dragged = LAZYACCESS(modifiers, DRAG)
|
|
if(dragged && button_clicked != dragged)
|
|
return
|
|
|
|
if (object && IS_WEAKREF_OF(object, middle_drag_atom_ref) && button_clicked == LEFT_CLICK)
|
|
ab = max(0, 5 SECONDS-(world.time-middragtime)*0.1)
|
|
|
|
var/mcl = CONFIG_GET(number/minute_click_limit)
|
|
if (!holder && mcl)
|
|
var/minute = round(world.time, 600)
|
|
|
|
if (!clicklimiter)
|
|
clicklimiter = new(LIMITER_SIZE)
|
|
|
|
if (minute != clicklimiter[CURRENT_MINUTE])
|
|
clicklimiter[CURRENT_MINUTE] = minute
|
|
clicklimiter[MINUTE_COUNT] = 0
|
|
|
|
clicklimiter[MINUTE_COUNT] += 1 + (ab)
|
|
|
|
if (clicklimiter[MINUTE_COUNT] > mcl)
|
|
var/msg = "Your previous click was ignored because you've done too many in a minute."
|
|
if (minute != clicklimiter[ADMINSWARNED_AT]) //only one admin message per-minute. (if they spam the admins can just boot/ban them)
|
|
clicklimiter[ADMINSWARNED_AT] = minute
|
|
|
|
msg += " Administrators have been informed."
|
|
if (ab)
|
|
log_game("[key_name(src)] is using the middle click aimbot exploit")
|
|
message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] is using the middle click aimbot exploit</span>")
|
|
add_system_note("aimbot", "Is using the middle click aimbot exploit")
|
|
log_game("[key_name(src)] Has hit the per-minute click limit of [mcl] clicks in a given game minute")
|
|
message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute click limit of [mcl] clicks in a given game minute")
|
|
to_chat(src, span_danger("[msg]"))
|
|
return
|
|
|
|
var/scl = CONFIG_GET(number/second_click_limit)
|
|
if (!holder && scl)
|
|
var/second = round(world.time, 10)
|
|
if (!clicklimiter)
|
|
clicklimiter = new(LIMITER_SIZE)
|
|
|
|
if (second != clicklimiter[CURRENT_SECOND])
|
|
clicklimiter[CURRENT_SECOND] = second
|
|
clicklimiter[SECOND_COUNT] = 0
|
|
|
|
clicklimiter[SECOND_COUNT] += 1 + (!!ab)
|
|
|
|
if (clicklimiter[SECOND_COUNT] > scl)
|
|
to_chat(src, span_danger("Your previous click was ignored because you've done too many in a second"))
|
|
return
|
|
|
|
//check if the server is overloaded and if it is then queue up the click for next tick
|
|
//yes having it call a wrapping proc on the subsystem is fucking stupid glad we agree unfortunately byond insists its reasonable
|
|
if(!QDELETED(object) && TRY_QUEUE_VERB(VERB_CALLBACK(object, TYPE_PROC_REF(/atom, _Click), location, control, params), VERB_HIGH_PRIORITY_QUEUE_THRESHOLD, SSinput, control))
|
|
return
|
|
|
|
if (hotkeys)
|
|
// If hotkey mode is enabled, then clicking the map will automatically
|
|
// unfocus the text bar.
|
|
winset(src, null, "input.focus=false")
|
|
else
|
|
winset(src, null, "input.focus=true")
|
|
|
|
SEND_SIGNAL(src, COMSIG_CLIENT_CLICK, object, location, control, params, usr)
|
|
|
|
..()
|
|
|
|
/client/proc/add_verbs_from_config()
|
|
if (interviewee)
|
|
return
|
|
if(CONFIG_GET(flag/see_own_notes))
|
|
add_verb(src, /client/proc/self_notes)
|
|
if(CONFIG_GET(flag/use_exp_tracking))
|
|
add_verb(src, /client/proc/self_playtime)
|
|
if(!CONFIG_GET(flag/forbid_preferences_export))
|
|
add_verb(src, /client/proc/export_preferences)
|
|
|
|
|
|
//checks if a client is afk
|
|
//3000 frames = 5 minutes
|
|
/client/proc/is_afk(duration = CONFIG_GET(number/inactivity_period))
|
|
if(inactivity > duration)
|
|
return inactivity
|
|
return FALSE
|
|
|
|
/// Send resources to the client.
|
|
/// Sends both game resources and browser assets.
|
|
/client/proc/send_resources()
|
|
#if (PRELOAD_RSC == 0)
|
|
var/static/next_external_rsc = 0
|
|
var/list/external_rsc_urls = CONFIG_GET(keyed_list/external_rsc_urls)
|
|
if(length(external_rsc_urls))
|
|
next_external_rsc = WRAP(next_external_rsc+1, 1, external_rsc_urls.len+1)
|
|
preload_rsc = external_rsc_urls[next_external_rsc]
|
|
#endif
|
|
|
|
spawn (10) //removing this spawn causes all clients to not get verbs. (this can't be addtimer because these assets may be needed before the mc inits)
|
|
|
|
//load info on what assets the client has
|
|
src << browse('code/modules/asset_cache/validate_assets.html', "window=asset_cache_browser")
|
|
|
|
//Precache the client with all other assets slowly, so as to not block other browse() calls
|
|
if (CONFIG_GET(flag/asset_simple_preload))
|
|
addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS)
|
|
|
|
#if (PRELOAD_RSC == 0)
|
|
addtimer(CALLBACK(src, TYPE_PROC_REF(/client, preload_vox)), 1 MINUTES)
|
|
#endif
|
|
|
|
#if (PRELOAD_RSC == 0)
|
|
/client/proc/preload_vox()
|
|
for (var/name in GLOB.vox_sounds)
|
|
var/file = GLOB.vox_sounds[name]
|
|
Export("##action=load_rsc", file)
|
|
stoplag()
|
|
#endif
|
|
|
|
//Hook, override it to run code when dir changes
|
|
//Like for /atoms, but clients are their own snowflake FUCK
|
|
/client/proc/setDir(newdir)
|
|
dir = newdir
|
|
|
|
/client/vv_edit_var(var_name, var_value)
|
|
switch (var_name)
|
|
if (NAMEOF(src, holder))
|
|
return FALSE
|
|
if (NAMEOF(src, ckey))
|
|
return FALSE
|
|
if (NAMEOF(src, key))
|
|
return FALSE
|
|
if(NAMEOF(src, view))
|
|
view_size.setDefault(var_value)
|
|
return TRUE
|
|
. = ..()
|
|
|
|
/client/proc/rescale_view(change, min, max)
|
|
view_size.setTo(clamp(change, min, max), clamp(change, min, max))
|
|
|
|
/client/proc/set_eye(new_eye)
|
|
if(new_eye == eye)
|
|
return
|
|
var/atom/old_eye = eye
|
|
eye = new_eye
|
|
SEND_SIGNAL(src, COMSIG_CLIENT_SET_EYE, old_eye, new_eye)
|
|
/**
|
|
* Updates the keybinds for special keys
|
|
*
|
|
* Handles adding macros for the keys that need it
|
|
* And adding movement keys to the clients movement_keys list
|
|
* At the time of writing this, communication(OOC, Say, IC, ASAY) require macros
|
|
* Arguments:
|
|
* * direct_prefs - the preference we're going to get keybinds from
|
|
*/
|
|
/client/proc/update_special_keybinds(datum/preferences/direct_prefs)
|
|
var/datum/preferences/D = prefs || direct_prefs
|
|
if(!D?.key_bindings)
|
|
return
|
|
movement_keys = list()
|
|
for(var/kb_name in D.key_bindings)
|
|
for(var/key in D.key_bindings[kb_name])
|
|
switch(kb_name)
|
|
if("North")
|
|
movement_keys[key] = NORTH
|
|
if("East")
|
|
movement_keys[key] = EAST
|
|
if("West")
|
|
movement_keys[key] = WEST
|
|
if("South")
|
|
movement_keys[key] = SOUTH
|
|
if(ADMIN_CHANNEL)
|
|
if(holder)
|
|
var/asay = tgui_say_create_open_command(ADMIN_CHANNEL)
|
|
winset(src, "default-[REF(key)]", "parent=default;name=[key];command=[asay]")
|
|
else
|
|
winset(src, "default-[REF(key)]", "parent=default;name=[key];command=")
|
|
calculate_move_dir()
|
|
|
|
/client/proc/change_view(new_size)
|
|
if (isnull(new_size))
|
|
CRASH("change_view called without argument.")
|
|
|
|
view = new_size
|
|
SEND_SIGNAL(src, COMSIG_VIEW_SET, new_size)
|
|
mob.hud_used.screentip_text.update_view()
|
|
apply_clickcatcher()
|
|
mob.reload_fullscreen()
|
|
if (isliving(mob))
|
|
var/mob/living/M = mob
|
|
M.update_damage_hud()
|
|
attempt_auto_fit_viewport()
|
|
|
|
/client/proc/generate_clickcatcher()
|
|
if(!void)
|
|
void = new()
|
|
if(!(void in screen))
|
|
screen += void
|
|
|
|
/client/proc/apply_clickcatcher()
|
|
generate_clickcatcher()
|
|
var/list/actualview = getviewsize(view)
|
|
void.UpdateGreed(actualview[1],actualview[2])
|
|
|
|
/client/proc/AnnouncePR(announcement)
|
|
if(get_chat_toggles(src) & CHAT_PULLR)
|
|
to_chat(src, announcement)
|
|
|
|
///Redirect proc that makes it easier to call the unlock achievement proc. Achievement type is the typepath to the award, user is the mob getting the award, and value is an optional variable used for leaderboard value increments
|
|
/client/proc/give_award(achievement_type, mob/user, value = 1)
|
|
return player_details.achievements.unlock(achievement_type, user, value)
|
|
|
|
///Redirect proc that makes it easier to get the status of an achievement. Achievement type is the typepath to the award.
|
|
/client/proc/get_award_status(achievement_type, mob/user, value = 1)
|
|
return player_details.achievements.get_achievement_status(achievement_type)
|
|
|
|
///Gives someone hearted status for OOC, from behavior commendations
|
|
/client/proc/adjust_heart(duration = 24 HOURS)
|
|
var/new_duration = world.realtime + duration
|
|
if(prefs.hearted_until > new_duration)
|
|
return
|
|
to_chat(src, span_nicegreen("Someone awarded you a heart!"))
|
|
prefs.hearted_until = new_duration
|
|
prefs.hearted = TRUE
|
|
prefs.save_preferences()
|
|
|
|
/// compiles a full list of verbs and sends it to the browser
|
|
/client/proc/init_verbs()
|
|
if(IsAdminAdvancedProcCall())
|
|
return
|
|
var/list/verblist = list()
|
|
var/list/verbstoprocess = verbs.Copy()
|
|
if(mob)
|
|
verbstoprocess += mob.verbs
|
|
for(var/atom/movable/thing as anything in mob.contents)
|
|
verbstoprocess += thing.verbs
|
|
panel_tabs.Cut() // panel_tabs get reset in init_verbs on JS side anyway
|
|
for(var/procpath/verb_to_init as anything in verbstoprocess)
|
|
if(!verb_to_init)
|
|
continue
|
|
if(verb_to_init.hidden)
|
|
continue
|
|
if(!istext(verb_to_init.category))
|
|
continue
|
|
panel_tabs |= verb_to_init.category
|
|
verblist[++verblist.len] = list(verb_to_init.category, verb_to_init.name)
|
|
src.stat_panel.send_message("init_verbs", list(panel_tabs = panel_tabs, verblist = verblist))
|
|
|
|
/client/proc/check_panel_loaded()
|
|
if(stat_panel.is_ready())
|
|
return
|
|
to_chat(src, span_userdanger("Statpanel failed to load, click <a href='?src=[REF(src)];reload_statbrowser=1'>here</a> to reload the panel "))
|
|
|
|
/**
|
|
* Initializes dropdown menus on client
|
|
*/
|
|
/client/proc/initialize_menus()
|
|
var/list/topmenus = GLOB.menulist[/datum/verbs/menu]
|
|
for (var/thing in topmenus)
|
|
var/datum/verbs/menu/topmenu = thing
|
|
var/topmenuname = "[topmenu]"
|
|
if (topmenuname == "[topmenu.type]")
|
|
var/list/tree = splittext(topmenuname, "/")
|
|
topmenuname = tree[tree.len]
|
|
winset(src, "[topmenu.type]", "parent=menu;name=[url_encode(topmenuname)]")
|
|
var/list/entries = topmenu.Generate_list(src)
|
|
for (var/child in entries)
|
|
winset(src, "[child]", "[entries[child]]")
|
|
if (!ispath(child, /datum/verbs/menu))
|
|
var/procpath/verbpath = child
|
|
if (verbpath.name[1] != "@")
|
|
new child(src)
|
|
|
|
// Place Help back at the end.
|
|
winset(src, "help-menu", "index=1000")
|
|
|
|
/client/proc/open_filter_editor(atom/in_atom)
|
|
if(holder)
|
|
holder.filteriffic = new /datum/filter_editor(in_atom)
|
|
holder.filteriffic.ui_interact(mob)
|
|
|
|
///opens the particle editor UI for the in_atom object for this client
|
|
/client/proc/open_particle_editor(atom/movable/in_atom)
|
|
if(holder)
|
|
holder.particle_test = new /datum/particle_editor(in_atom)
|
|
holder.particle_test.ui_interact(mob)
|
|
|
|
/client/proc/set_right_click_menu_mode(shift_only)
|
|
if(shift_only)
|
|
winset(src, "mapwindow.map", "right-click=true")
|
|
winset(src, "ShiftUp", "is-disabled=false")
|
|
winset(src, "Shift", "is-disabled=false")
|
|
else
|
|
winset(src, "mapwindow.map", "right-click=false")
|
|
winset(src, "default.Shift", "is-disabled=true")
|
|
winset(src, "default.ShiftUp", "is-disabled=true")
|
|
|
|
/client/proc/update_ambience_pref()
|
|
if(prefs.read_preference(/datum/preference/toggle/sound_ambience))
|
|
if(SSambience.ambience_listening_clients[src] > world.time)
|
|
return // If already properly set we don't want to reset the timer.
|
|
SSambience.ambience_listening_clients[src] = world.time + 10 SECONDS //Just wait 10 seconds before the next one aight mate? cheers.
|
|
else
|
|
SSambience.remove_ambience_client(src)
|
|
|
|
/**
|
|
* Handles incoming messages from the stat-panel TGUI.
|
|
*/
|
|
/client/proc/on_stat_panel_message(type, payload)
|
|
switch(type)
|
|
if("Update-Verbs")
|
|
init_verbs()
|
|
if("Remove-Tabs")
|
|
panel_tabs -= payload["tab"]
|
|
if("Send-Tabs")
|
|
panel_tabs |= payload["tab"]
|
|
if("Reset-Tabs")
|
|
panel_tabs = list()
|
|
if("Set-Tab")
|
|
stat_tab = payload["tab"]
|
|
SSstatpanels.immediate_send_stat_data(src)
|
|
|
|
/// Checks if this client has met the days requirement passed in, or if
|
|
/// they are exempt from it.
|
|
/// Returns the number of days left, or 0.
|
|
/client/proc/get_remaining_days(days_needed)
|
|
if(!CONFIG_GET(flag/use_age_restriction_for_jobs))
|
|
return 0
|
|
|
|
if(!isnum(player_age) || player_age < 0)
|
|
return 0
|
|
|
|
if(!isnum(days_needed))
|
|
return 0
|
|
|
|
return max(0, days_needed - player_age)
|
|
|
|
/// Attempts to make the client orbit the given object, for administrative purposes.
|
|
/// If they are not an observer, will try to aghost them.
|
|
/client/proc/admin_follow(atom/movable/target)
|
|
if(!isobserver(mob))
|
|
SSadmin_verbs.dynamic_invoke_verb(src, /datum/admin_verb/admin_ghost)
|
|
if(!isobserver(mob))
|
|
return
|
|
|
|
var/mob/dead/observer/observer = mob
|
|
observer.ManualFollow(target)
|
|
|
|
/client/verb/stop_client_sounds()
|
|
set name = "Stop Sounds"
|
|
set category = "OOC"
|
|
set desc = "Stop Current Sounds"
|
|
SEND_SOUND(usr, sound(null))
|
|
tgui_panel?.stop_music()
|
|
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Stop Self Sounds"))
|
|
|
|
/client/verb/toggle_fullscreen()
|
|
set name = "Toggle Fullscreen"
|
|
set category = "OOC"
|
|
|
|
fullscreen = !fullscreen
|
|
|
|
if (fullscreen)
|
|
winset(usr, "mainwindow", "on-size=")
|
|
winset(usr, "mainwindow", "titlebar=false")
|
|
winset(usr, "mainwindow", "can-resize=false")
|
|
winset(usr, "mainwindow", "menu=")
|
|
winset(usr, "mainwindow", "is-maximized=false")
|
|
winset(usr, "mainwindow", "is-maximized=true")
|
|
else
|
|
winset(usr, "mainwindow", "menu=menu")
|
|
winset(usr, "mainwindow", "titlebar=true")
|
|
winset(usr, "mainwindow", "can-resize=true")
|
|
winset(usr, "mainwindow", "is-maximized=false")
|
|
winset(usr, "mainwindow", "on-size=attempt_auto_fit_viewport")
|
|
|
|
/client/verb/toggle_status_bar()
|
|
set name = "Toggle Status Bar"
|
|
set category = "OOC"
|
|
|
|
show_status_bar = !show_status_bar
|
|
|
|
if (show_status_bar)
|
|
winset(usr, "mapwindow.status_bar", "is-visible=true")
|
|
else
|
|
winset(usr, "mapwindow.status_bar", "is-visible=false")
|
|
|
|
/// Clears the client's screen, aside from ones that opt out
|
|
/client/proc/clear_screen()
|
|
for (var/object in screen)
|
|
if (istype(object, /atom/movable/screen))
|
|
var/atom/movable/screen/screen_object = object
|
|
if (!screen_object.clear_with_screen)
|
|
continue
|
|
|
|
screen -= object
|
|
|
|
#undef ADMINSWARNED_AT
|
|
#undef CURRENT_MINUTE
|
|
#undef CURRENT_SECOND
|
|
#undef LIMITER_SIZE
|
|
#undef MINUTE_COUNT
|
|
#undef SECOND_COUNT
|