* Extract requests console message sending code.
* Add secondary goals
* Converted supply shuttle to a signal-based system.
* Lint.
* Review suggestions.
* Secondary goals can now check the supply shuttle for their requirements.
* Remove redundant completion variable, undef what we define.
* Made the request console refuse to issue a secondary goal until you finish the current one.
* Made the shuttle blacklist error more specific, added locked/manifest-attached crates to blacklist.
* Added round end secondary goal report.
* Lint
* Add tags to reagents for secondary goals to use.
* Extracted the reagent logic from the bar goal, used reagent tags.
* Added the Variety of Drinks Bar goal.
* Added variety drinks goal for the Bar.
* CC no longer complains about sending stuff in containers, but the shuttle will refuse lockboxes without goal items.
* Allow unlocked lockboxes on the shuttle.
* Added kitchen goals.
* Lint
* More lint
* Add goals for scichem and medchem, pending reagent labelling.
* Added Kudzu goal for botany.
* I forgot to rename them, oops.
* Lint
* Made mechs sellable, configurable goal rewards.
* Balancing changes.
* Added random Ripley goal.
* Add Clear Task Backlog station goal.
* Lint
* Oops.
* did i even do this right
* Lint
* Excluded drinks available from upgraded booze dispenser.
* Such bugs. Much fix. Wow.
* Goal notice formatting.
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Made storage nesting better, improved consistency between storage types.
* Out, er, space.
* Added a proc for sending a requests console message.
* Added error messages to Virology Goals.
Backported a few small things from Secondary Goals to make this easier.
* Extracted out the three-way reward code into a proc.
* Update code/__DEFINES/dcs/signals.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Removed redundant SIGNAL_HANDLER labels.
* Yes, that should be a proc.
* Enforce important parent calls.
* Thank you, DreamChecker
* Undid accidental merge of #24699
* Removed a testing proc that wasn't intended for this PR.
* Removed parts of #24750 that also crept in.
* Made the variety of [x] goals more explicit that they want 50u of each.
* Reduced Kudzu trait requirement to 1.
* Request consoles now output the list of valid departments if you're at an unsupported one.
* Added personal crates.
* Added a supply pack of personal crates.
* Added special cargo handling for personal crates.
* Added automatic personal crate when requesting a goal.
* Required personal crates for most secondary goals.
* Add goal labels to the hand labeler, require them for mech goals.
* Made secondary goals one-per-person, not one-per-department.
* Added support for multi-line system messages to the request consoles.
* Made the RC message for goals nicer.
* Send goal crates even if no normal crates are ready, name and access-lock them properly.
* Don't double-label.
* Let's not use registered_account, names are fine.
* Add a ton of blackbox data to cargo and secondary goals.
* Fix a few bugs.
* More bugfixing, couple more stats.
* Even more stats.
* Text fix.
* Made cargo fines more consistent with other cargo feedback.
* Fixed a bug that prevented non-top-level items from being checked for CARGO_REQUIRE_PRIORITY.
* Blocked large crates from being sent back unopened.
* Enum values should probably be different from each other.
* Correct a bitflag mishap.
* Removed redundant supply shuttle docking and buy/sell attempts.
* Tweak message about personal crates to inlclude that they need to lock it.
* Add /Crates to the Personal Lockers description.
* Less pretty alignment, less complaining linters.
* Corrected a bad name in stats tracking.
* Reduced SciChem variety goal to 5 types.
* Toned down Task Backlog a bit.
* Fixed a bug that made unsellable items nested in containers be stolen by CC (qdeleted).
* Don't require bluespace 8, that's silly.
* Made secondary goals modifiable in the Modify Station Goals UI.
* Whoops, that was supposed to be 600u.
* i ded pls nerf
---------
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* TGUI upgrade project: Port initial TGUI 4.0 changes from TG (#23440)
* tgui4.0
* bugfix for un-interaction
* fix for input not resetting on close
* NTOS restore
* fix all interfaces having scrollbars, fix colours
* bundle update
* dep bumps
* bumps the deps as much as possible
* button regression fix
* TGUI test map rev 1
* fix theme and some component regression
* fix login screen regression
* fixes regression with uplink cart
* bundle
* fix regressions
* fix the input issue, again
* regression fixes, stylesheet edition, hash restore
* fixes GPS BSOD
* draggable control regression
* dev server dep regression
* byondUI regression fix
* section regression fix
* fix secure storage weirdness
* Fixed mining vendor scrolling
* Arthri review pass 1
* mining vendor double-scroll
* fix for RPD, AirAlarm, and Radio
* arthri review pass 2
* arthri review pass 3
* sanitize var setting, fix colours, delete unused file
* adds CI to branch
* god damn AI making random changes
* I should remember to compile when changes are made
* fixes scrollbar issues
* fix camera console, fix flexGrow for sections
* CI fix
* nanomap fix
* Update code/modules/atmospherics/machinery/airalarm.dm
* restore margin
* style semicolon
* TGUIv4 - Moves TGUI Window Sizing from DM to JS (#23524)
* Initial commit
* Transferring the remaining windows to JS
* Resizing part 1
* Resizing part 2
* Some reverts and polish
* Forgot that
* undeployed nuke window size
---------
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
* TGUIv4: Remove force_open (#23537)
* First state fixes
* Removes "force_open"
* TGUIv4 - TGUI Version 4.1 (#23547)
* Reduced Logging Changes
* setSharedState early return for non-interactive UI
* TGUI version bump to 4.1
* Fix sending updates for non-interactive UIs
* Scalablue UI Stylesheet Changes
* CSS Tgui Bundle
* JavaScript TGUI Style Changes
* Update tgui/packages/tgui/styles/base.scss
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
* Additional changes to Input and Button scalability
* TGUI logging proc update
* Indentation fix for logging proc
* Update code/__HELPERS/_logging.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Additional log_tgui changes
---------
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* dev server hotfix (#23584)
* ui_interact object constructor argument check (#23594)
* feat: add smart asset cache, add CDN support for assets, properly group assets (#23585)
* feat: add smart asset cache, add CDN support for assets, properly group assets
* fix: make tgui actually work
* fix: keeping local name for `tgui.bundle.js` and `tgui.bundle.css` for debug and dev server functioning
* fix: make `fontawesome` assets finally work
* fix: make proper identation for `if`
* fix: add `resolveAsset` to `NanoMap.js`
* refactor: update `claw_game` and `chess` to new asset framework
* refactor/tweak: don't use string concatenation for browser `content` and `head_content`, use list instead. Don't use `common.css` for paper UI, keep local name for stamp image assets, replace hard ref of browser to `atom` (rare case) to `UID`
* refactor: remove redundant debug logs
* refactor: remove space betwee `if` and `(`
* refactor: remove one more redundant log, properly reload UI resources
* rafactor: change names of asset files
* fix: adjust existing UIs to properly use assets
* fix: properly pass args to to `onclose` proc
* Update code/modules/asset_cache/transports/asset_transport.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Update code/modules/asset_cache/transports/asset_transport.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUI 4.2: TGchat + Refactor Asset Delivery + Yarn Berry (#23643)
* tgchat
* Little cleanup
* Refactor Asset Delivery (Part 2)
* Little tweaks
* fix code styling issues
* fix file name duplications
* Browser window options fix @gaxeer
* transfer valve fixes
* yarn berry initial
* vsc tasks
* yarn berry working
* node 20
* fix dev server (lol wrong yarn)
* bloody regressions
* fixes that damn scrolltracking bug
* Some tweaks and flexGrow deletions
It still doesn't work as it should, which makes me nervous
* remove unneeded deps
* 514 regression fix
* change stuff to not conflict with other servers
* name it as requested
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* revert test_TGUI map addition
* TGUI 4.3: Stack, Webpack 5 & UI Tweaks, Yarn 3.6.4, TS support, Jest (#23677)
* Stack & UI's Refactor
Almost final, polish required
Stack & UI's Refactor (Part 1)
Stack & UI's Refactor (Part 2)
Stack & UI's Refactor (Part 3)
* Prettier
Maybe bad
* ClearChat & some tweaks
* Adds a Chat Reliability Layer https://github.com/tgstation/tgstation/pull/79479
* Fix chat BSOD
https://github.com/tgstation/tgstation/pull/79821
* WebPack 5 (Didn't work)
I hate this shit
* Yarn 3.6.4
* make it all work
* revert snowflake fix
* Stories
* adds TS support
* re-enable test and prettier
* update yarn sdk's
* Fix some box regression
* ping/reply
* Fixes regressions and some things
* Zebra and Fix chat button transfer
+rebuild
* make VSC use the proper local typescript lib
* Popper Tooltips https://github.com/tgstation/tgstation/pull/58980
* Popper Tooltips performancy fixes
* Dropdown v2 https://github.com/tgstation/tgstation/pull/75164
Without Icon.tsx
* BB test map
* run build
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* we moved these
* change test values
* ignore scss files
* change hash function
* TGUIv4: TGchat fix traitor codeword highlighting (#23720)
* Codeword highlighting for TGUIv4
* null safeties
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* TGUIv4 - updates standalone build tooling (#23721)
* swap `xxhash64` for `md4`
* remove hash function
* remove old file
* TGUI 4.3+4.4: Newscaster fix, `inline-block` replacements and other fixes (#23722)
* TGUI 4.3 fixes
Newscaster fix + inline-blocks
* Be gone Box
* Mod Chat -> Mentor Chat
* Some warning filters
* Rebuild
* Delete tgui-common.bundle.js
* please work
* try it like this
* 4.3.1
* 4.3.2
* fix
* i forgot to build
* 4.4.0
* give me more diff details please so I can fix you
* its not binary pls git
* test without svgs
* removes an un-needed SVG file
* inlined SVGs test
* fix code styling
* comment these
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUIv4 - Removes resizable and improves drag code (#23719)
* Initial commit
* bundle rebuild
* Fixes Radio Sizing
* Updates Radio sizing to fix wrapping issues
* fix dev server
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix hotkeys not being passed to BYOND
* Apply suggestions from code review
* bump deps
* forgot these deps
* ci fix
* ChemDispenser fixes and HoloControl cooldown
* Station Traits TGUI
+Rebuild
* CI
* fix CI for real this time
* I have no idea
* fix station trait panel
* Update code/controllers/subsystem/SSping.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/controllers/subsystem/SSticker.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/controllers/subsystem/SSping.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* deterministic module IDs
* TGUI fixes. Again... (#23762)
* TGUI Fixes: Part 1
ORM icon for reinforced glass now showing correctly
Mining vendor moved to Stack
Exofab UI buttons descended from the heavens to the earth
* TGUI Fixes: Part 2
DestTagger now works, forgot import LabeledList
PowerMonitor graph displays correct
Request Console updated to 2.0, BUT, problem with message priority, it was there before the changes, maybe even before the project, I'll have to check it out
* TGUI Fixes: Part 2
Fixed `onEnter` input
Fixed Cloning Console storage (Im dumbass)
Some windows resizing
Fixed bad picture in security and medical records console
Fixed scrollable dropdown
Added translucent color for buttons
* Fucking uplink DONE, and Button.Input fix
* NT Recruiter and Uplink polish
* Del LabeledList from dest. tagger
* ChemMaster and OreRedemption log deletion
* Update test_tiny.dmm
* Translucent button story
* Filter for SQL error
* del: `log_debug` in `hear_say.dm`
* Some little fixes and SpecMenu Stack
* Panel.js: mx -> mr
* fix ghost spawners
* null check
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix material name in protolathe
* fix various UI interacts
* card machine runtime fix
* remove legacy folders
* TGUIv4 - TGchat Theme Adjustments (#23772)
* Initial commit
* Changes rule grouping
* Robot class style changes and webpack config
* Reverts webpack/font changes and subs robot font
* revert a state changed in error
* fix uninteractable UIs due to chunky fingers
* TGUIv4: More fixes, tweaks and fixes for tweaks (#23781)
* I fuckin hate PDA
* Vending
* Add `|` to highlight splitters and some light mode tweaks
* Teleporter rewrite
* APC and AiAirlock (God forgive me)
* clarify highlight syntax
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* TGUIv4 - Abductor Experiment Machine TGUI (#23776)
* Experiment Console TGUI
* Update for TGUIv4
* UI Size adjustment
* ui state and ghost attack update
* remove this
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* fix
* TGUIv4 - Adjustments, Fixes, and Tweaks (#23785)
* Photocopier layout adjustments
* Autolathe Text and Button spacing adjustment
* Hotkey fix for moving bug
* Removes rule sets for visited links
* Fixes ordering multiples on cargo console
* fix possible wonky json payloads
* fix admin log input list stuff
* TGUIv4: Reconnect fix and some other fixes + tweaks (#23790)
* Fix reconnecting and transfer it to TSX
* RPD polish
* RCD, AccessList, GuestPass
* Focus reset fix when camera switched. God forgive me again...
* Purple box and identation fixes
For votes and health scanner
* ChemMaster and ChemDispenser
ChemMaster - translucent pills buttons and no grow produce section
ChemDuspenser - dynamic height
* ShuttleManipulator Tabs
* RCD buttons
* make input bar mode more prominent
* fix chem master icons
* tab fix
* Properly sanitizes loaded messages in tgui chat
* TGUIv4 - Adjustments, Fixes, and Tweaks v2 (#23795)
* Fixes icon spacing for nanobank tabs
* Tweaks Dropdown styling
* Fixes sending stuff to old chat
* OpenDream TGUI fix
* Resizes Station Traits window
* Adjusts health analyzer messages for chat tabs
* Revert "Properly sanitizes loaded messages in tgui chat"
This reverts commit 4c32a7094a.
* Revert "Revert "Properly sanitizes loaded messages in tgui chat""
This reverts commit 24afa55922.
* Changes how tgui handles static data
* Reenable no-undef rule. Enable Format On Save for VSCode (#23803)
* Enable Format On Save for VSCode
* Re-enable and fix no-undef
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* pda scanner message improvements
* fix mentor/admin PMs being sent to the "unsorted" category
* fix garbled custom vote messages
* moves cyborg analyser to use chatboxes
* fixes regression
* Prevent F5 reload
* TGUIv4: Themes polish and some new ones + misc fixes (#23814)
* Little themes tweaks
* NTOS chat theme
* Update tgui-panel.bundle.js
* Capitalize themes
* Paradise theme v1.0
* Little StationTraitsPanel cleanup
* Update member_content.dmi
* NoCapitalize
* Rebuild
* Delete Paradise.scss
* Create paradise.scss
* Forgot
* Rewritten Security Records Console
For Jesus fucking christ...
* Vending and Wires sizes tweaks
* ThermoMachine
* Syndicate Theme
* Little darker
* Rewritten Medical Records Console
* PDA Nanobank fix
* Syndicate Theme Darker
* Rebuild TGUI
* Wires section grow fix
* fixes the enshittified paradise icon
* Sirryan+Warrior reviews
* bloody define comments
* comment correction
* unprivate these
* errant . begone (how did this not cause a compiler error)
* TGUIv4 - Adjustments, Fixes, and Tweaks v3 (#23807)
* Fixes ERT Manager silenced message function
* Adjusts progress bar on ExosuitFabricator
* Sets Dropdown selected to align left
* Removes the use of self_state select interfaces
* Exosuit Fabricator style adjustments
* fix sextractor UI
* remove empty tochat string
* fix human air alarm interactions
* fix modals
* add F12/IEChooser
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Aylong <alexanderkitsa@gmail.com>
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life
* some changes /fixes
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes
* oh right, the murders (uplink price tweaks)
* Update code/controllers/subsystem/SSjobs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* compiles
* doesnt work but works better
* tgui dogs still sleep but I want to sleep
* it should finally compile now. Probably.
* Update tgui.bundle.js
* Sorry IAN, transfer components is shoddy as hell
* removes minor uneeded /tgui
* also extra line whoops
* final stuff
* reverting changes I made earlier is hard ok
* Weight change, uplink reference
* oh right, the hey fucko
* Update code/_globalvars/traits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update tgui.bundle.js
* pushes
* pulls it
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes, ion rifle blocked on cyb revolution
* dipshit remove the debug / tgui pritier and such
* tgui
* updates tgui again as nanomap was merged
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* comment / tgui
* every day I worry all day
* Full TGUI rebuild + prettier
* ah fuck
* leave a customer feedback at the link below!
* tgui momenr
* tgui moment
* FUCK I am dumb
* vertical TGUI
* She T's on my GUI till I
* Update tgui.bundle.js
* Apply suggestions from code review
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* IPC can now use robotic hearts / pulse demon hearts and charge
* fixes revert not working for hangover / arrivals
* tgui moment
* hhgreg
* fixes that one bug
* Every day I worry all day
* deconflicted for real this t ime
* Update code/datums/station_traits/postive_traits.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* ch-ch-ch-changes
* Update SSjobs.dm
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* deconflicted but won't pass CI
* fixes double dipping on traits
* my le consoles, they le no work?
* Great Great Asset, Asset, Great Great Asset, Asset...
* sorry slime mains
* fixes borgs being punished heavier
* actually fixes it, I was dense
* hopefully fixes borg drunk further
* makes it compile?
* actually makes it compile god whyyyy
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* comments out TEG crate
* buffs turbine power generation curve.
* adds overheat to turbine
* Allows for overheat to dissapate while at low RPM
* Adds bearing heat meter to control console
* Multitool is now required to link turbines
* spacing consistancy
* comment per Sirryan review
* adresses review, replaces reconnect with DC button
* better comments
* properly defines things. debugging is important
* temp must be above 500k for power to be generated
* Adresses latest review
* Define fixes
* TGUI update
* should fix CI. Probably.
* typo fix
* lewcc review
* Deconflicted TGUI
* Heri and Hal reviews
* Deconflict TGUI
* deconflicts TGUI
* Steel review
* Slight formatting
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* biting off more than I can chew, but I feel like hurting myself
* more shit
* progress continues, moral stays sameish
* bite of 2587
* mod_theme down, but probably broken
* 385 errors, 16 warnings, zero tgui interactions
* 292 19
* final strech to buggy mess, break time
* it compiles. It almost fucking certainly doesnt work, but it compiles
* fudhsciffubgsbgpgb actions not working as should for modules
* fuck it we'll just open the pr as we work on it
* icons work now
* tgui stuff
* more progress
* JUDGEMENT
* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.
* jetpacks, gps, and go do what exo-suits yourself
* almost ready
* sorry to whoever has to review this
* should work™️
* should be good now
* pushing changes so I can do reviews next
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* lore™️ Adds illegals level to modsuit parts from syndicate.
* early returns
* and these illegals
* no uplink reference idiot
* mod inhands are a good idea
* this is needed for inhands nerd
* Bomb detector working, modsutis cover ears. skin things
* overslotting removal, cyborg charging, ert loadout for gamma
* duplicated signal
* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.
* tether module, orb module, holster stuff
* built in no slip, cheaper 87
* removes modules already installed, engineer ert get jetpack, equip into modsuit storage
* comments spaces and duplicate flags
* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Compile TGUI, slowdown adjustment, Modsuit to MODsuit
* sonar, do after, more equipment, acid handling
* overlay bugs / ERT / DS suits autodeploy
* middle click action buttons
* traders, sec modsuit energy nerf
* surplus weighting
* Kinesis module.
* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis
* more power / unused module removed
* name, ds fix, pre equipped to cc suit
* depot / grammer
* ok should be good™️
* overslot, dupe gun, missing suit storage
* stealth nerf, new kit
* gun stuff / ds theme
* bio armor is gone
* let me push changes please thank you
* makes shocks work right
* copies over some changes TG made to module prices after porting
* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-
* sirryans changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Control define, ERT / DS have gloves / boots again.
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* More changes
* god I hate tgui. Why do all the bundles live underground, instead of in my basement?
* she updates my master till I testmerge
* modsuits can recharge again
* fixes a lot of shit
* Ready for TM probably
* sure fuck it whatever that makes sense I guess
* the pinpointer works better™️
* Another storage module bug fix
* hair and medical stuff
* fuck fuck fuck
* fixes sonar
* Bag exploit fixes / plasma runtimes / ear nerf
* dna lock improvement / cryostorage
* whoops
* Ball form second cooldown wasn't helping, no more infinite cores
* she springs my lock till I ***SNAP***
* plasmaman no longer die
* fixes modsuit emp issues
* atmos no longer fucking dies
* Fixes, module printing, and a restriction on newly constructed modsuits
* Inventory code my hated
* WOOO PREFERENCE CODE WOOOOO
* icons my hated
* fix for mods / spaceproof shit
* holy shit whhhyyyyy
* backpack first
* Update mod_theme.dm
* prevent infinite gun arms / infinite modsuit cores / syndicate modules
* fixes tm error
* scream loudly if species sprites break. They shouldn't, but, you know.
* deconflicted with luck
* converts to refit for species
* fix pathfinder
* fixes modsuits being funky power wise
* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit
* nerfs the atmos modsuit
* magboots for ds / CC modsuit
* downside of autosave: typing in wrong window saves bad stuff
* Gamma ERT have internal cameras again.
* spellcheck when
* ah fuck
* yes delete the null that works
* whoops
* fixes error / description
* un vulps your cannon
* fixes tails disapeering on base modsuits
* space to underscore
* tgui fix / tajaran
* springlock buff, cryopod fix
* u helps
* WHO PUTS A GUN IN ITEMS
* tgui moment
* mining modsuit nerf / hidden holster module
* PAIN
* UNATHI TIDE STATION WIDE
* I love special code
* slightly dense
* shark jumpscare
* fixes ghost item, fixes springlock being bad
* YIPPEEEE IT WORKED
* she decons my flict
* pain
* ebbas days are numbered :^)
* hidden
* r-r-r-ebuild
* fixes more bugs
* qwerty, you are dense
* fixes gps
* fix mulebot crate
* level fix
* adds back icon
* moving storage, fix bug, modules activate / deactivate message
* yeah
* yeah
* yeah™️
* steels requests
* windoors no longer make pathfinder module explode
* chat spam
* oil slicks + modsuits
* whoops
* bag check
* ofc
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/uplink_items/uplink_nuclear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/modules/module_pathfinder.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* ok one second I gotta do something else
* Okay we ball
* Okay we are stealthier now
* Does this work? I have no idea.
* So cloooose
* I don't know what the fuck I am doing
* IT WOOOOOOORKS
* Contra reviews
* oops
* Contra review
* Now it actually works
* Reworks and nerfs WTs
* Removes some duplicate comments
* Makes WT ammo box's normal sized items because I forgot to at first
* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once
* Sanity checks work properly now
* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Magazines fit in security webbings
* I forgot a comma
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Applying various reviewer suggestions
* Applies various suggestions
* removes moving_do_after now that its a param
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* solves the merge conflict hopefully
* step one of trying to fix conflict again
* step two hopefully fixes conflict
* Delete ammo.dmi
* Merge branch 'master' into wt-rework
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Applying various reviewer suggestions
* Revert "Applying various reviewer suggestions"
This reverts commit 7081e9aa2b.
* Revert "Apply suggestions from code review"
This reverts commit 96dab4f8b8.
* Revert "Merge branch 'master' into wt-rework"
This reverts commit 6906a67654.
* Merge branch 'master' into wt-rework
* please god work
* Update code/modules/projectiles/ammunition.dm
* Update code/modules/projectiles/ammunition/magazines.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Flood lights!
* gramma! my enemy!! (and a forgotten span)
* gramma AGAIN!
* more spans
* runtime issue, wording, and simpler crowbar
* changes a 1, to a TRUE
* Allows admins to create cargo crates
* AA and Miravel review
* remove debug text
* AA review
* Oops
* sirryan review
* sirryan review 2
* atom to turf
