mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-31 20:53:34 +00:00
b3cc376f1cd63da8564a3bf995fae83cae6b344c
9 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Kyani
|
32719e2f99 |
Adds map: EmeraldStation (NSS Diagoras) (#26438)
* fleshed out engi and asteroid * command work * more department fleshing out: sec * sec work * perma work * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * med and dorms fleshing out * sci and service fleshing out * Update EmeraldStation.dmm * APCs done + detailing * Update EmeraldStation.dmm * wire work * more wire work * wires and LIGHTS * ATMOS DONE now onto DECOR * AI/status monitors * intercoms and newscasters * Wall items and cameras! * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * Update EmeraldStation.dmm * moved the file to the correct area * bugfixes, starting up the map * refining the asteroid * merge fixes * logs of bugstomping * more bugfixing * bugfixing * bugfixin * trying to make the stupid lava work * adds plasma vent for test * more testing * swapped file places * vents work now! * Update paradise.dme * vent sprite update * file corrections * Asteroid MILLA changes * adds a new MILLA atmos type * Build MILLA * oopsie * fixes * removed testing code * reverts map start * reverts the atmos change * respriting geyser * comments * Update code/__DEFINES/atmospherics_defines.dm Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update geyser.dmi * Update paradise.dme * fixing past merges * adds some missing items from merges * reverting * reverts changes again * deleted unused file * oops forgot nearspace areas * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/area/ss13_areas/engineering_areas.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/turfs/simulated/floor/lava.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * Lots of map fixes * Update EmeraldStation.dmm * trying to unfuck the milla merge * removed station from dme * fixes/small tweaks/suggested changes * removed errant turret * redid telecomms * Update EmeraldStation.dmm * rebuilding everything * redoing security * more sec work * perma shaped up + more items * renamed properly this time * resetting atmos code * more secwork and move papers off varedits * more secwork + dorms + funeral services * added new areas + pipe/wires/floors * security electrified windows/wires/alarms/lights * cameras, dorms pipes/ires/alarms/apcs * merged * disposals * lots of wall things + added map datum for testing * pipe fix for linter * fiddled with maints * minor maint edits * fixes + maint work * more bugfix * even more bugfixing * MORE nearspace fixing * dumb nearspace fix * Update code/game/objects/structures/plasma_geyser.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> * a LOT of fixes + door access * disposal pipe update script * oops linter fixes * fixed viro button runtime * finished maints + space decor * removed hall light switches * fixed solars areas * removed errant lattice * remove agent B from asteroid * wall bump placement refining * apc fix * bugfixing * minor maint change * bugfixing * burn tile on node fix * changed official name * bugfixing * added genetics locker+figures * bug hunting (buttons mostly) * added firelocks. oops * added temp webmap + bugfix * Update emeraldstation.dmm * new webmap. again * added the perma tools * nanomaps * bug fixes, fixes, and more fixes * more tweaks * cable fix * more bugfixing * Update emeraldstation.dmm * tiny fix * fix AI sat turrets * more bugfixing * MORE bugfixing * bugfix + ruins soundfile * pipe bugfix * fixed toxins pipes. junctions bad? * swimwear :) * remove errant QM gps * rnd shutter button missing * potato layering fix * add bridge request console * fix window tint in interrogation * added some clothes * nanomaps2, asset boogaloo * modified an empty hall, added some perma cams, minor fixed * forgot to save before push oops * widens sci maint hall + bugfix * gives theatre its autodrobe back! * moved borg spawns * moves nuke op default spot * new asteroid mix + botany tweak * adds cremator button * new sign + moved pod + bugfixing * cable fix * engine, sci chem, and surgery tweaks * more bugfixes and tweaks * more tweaks * adds a few windows back to robotics * bar was missing pun pun! * corrected misplaced atmos machines * re-added the bathroom * fixes atmos waste disposal injector * modified mr potato * changed bathroom area * minor toxins tweak * small wall decor tweaks * removes errant lights * removes errant opier * LOTS of fixes/tweaks + adds CO2 to asteroid * gave maint some boxes + cable fix * duped brig lock * adds masks to medbay storage * adds missing gues passes * cleanup from kitchen rework * gives solars enough glass to complete it * adds another defib to cryo pods * makes asteroid sign fireproof * perma maint now opens with virus + bugfixs * bugfixing + adds missing holopads * more holopads + bugfix * adds some smoke vendors * kitchen area tweak * fixed errant rack * rearranged/spread out cig vendors * moved a cig machine again * added RD tint button * undid a brig area change * removed errant posters * added filing cabinets + bugfix * maint morgue tray fix * adjusted chapel + bugfix * fixed palms + minor sec floor tweak * adds forgotten magi and clown starts * gave engi a shower * reworked robotics + atmos bugfix * geysers now work at 1/10 capacity when overpressure * bugfixing + tweaked overrides/variables * rework warden office * bugfixes + adds some holopads * added missing bio shutter * more small tweaks * adds RnD rework + gives mag some things * fixed fabricators * tweaked robo + added rnd server board * added rnd backup circuit * bugfixing * bugfixing again * bugfixing * fabricator fix --------- Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> |
||
AffectedArc07
|
69f20e250b |
Removes Nanomob (#25417)
* Nukes nanomob * Forgot this * Update code/modules/client/preference/loadout/loadout_general.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> |
||
Aylong
|
c8e59706e2 |
OOC Emoji 2.0 - TG Edition (#25012)
* Didn't work * It works * Emojipedia * Some emoji sorting * lol * Remove a lot of shit emoji * Update emojipedia.dm * Observer and ghost-bar emoji * Msay emoji * Emoji sorting and updates * Make emoji centered * Clueless and trollface * Mowzers * +taa * Another rebuild * TRUE and Rebuild |
||
Contrabang
|
744d9c6bed |
Ports and Adapts TGUI strip panel from TG (#24618)
* part 1 * these also * fuckin nuke it * more * more stuff * more crap * wow * holy fucking shit, it works * thats a start * oops * fubing bundle * hahah brrrrr * I LITERALLY ADDED IT BACK, FUCK OFF GIT * yeah more changes * hide abstract * blamo * thats enough for today * old code begone * goodbye can_strip * nearly there * finally * fuckin finally * review * tgui * unbreak shit * fix OD * okay, that should fix the last thing * remove hover on nodrop, fix early interacting |
||
|
Contrabang
|
a3c1fecf02 |
Orbit menu now shows assigned roles to antaghud users (#24578)
* lol * FUCK YEAH * the rest of the bundle * Update code/modules/asset_cache/assets/asset_orbit_icons.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> * little tgui thang --------- Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> |
||
warriorstar-orion
|
35ca57c262 |
Add constructible transit tubes. (#24045)
* Add constructible transit tubes. * Apply suggestions from code review Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * change construction type, add icon state * don't give any glass back, support RPD recycling * destroy/explode into glass decals * Update code/game/objects/structures/transit_tubes/transit_tube_construction.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * tube automatic orientation is unintuitive * support manual flip/rotate like pipes * better logic for installation * better support for building in space * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * second half of review suggestions * Update code/game/objects/structures/transit_tubes/transit_tube_construction.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> |
||
|
Aylong
|
38f009b763 |
[TGUI] Prize Counter (#24079)
* PrizeCounterUI 1.0 Update PrizeCounter.scss Update prize_counter.dm UI work It just works * Image layout fix * Better names * Tooltip * Unused code and disable button * That's not necessary either * Search * Maybe that's all * Stack.Divider, wow, universal component * Rebuild * Rebuild * Turn off auto-update * Ooops * Code style * Rebuild * Ah... yes... rebuild * Ticket icon like on screenshot |
||
|
Aylong
|
59af3354b5 | FontAwesome 6.5.1 (#24585) | ||
S34N
|
22fbd9aced |
TGUIv4 - Core backend updates, TGchat, Asset cache updates (#23726)
* 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 |