Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream 14.09.2024 #1508

Merged
merged 35 commits into from
Sep 14, 2024
Merged

Commits on Sep 12, 2024

  1. Configuration menu
    Copy the full SHA
    64f49e0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    512ec5c View commit details
    Browse the repository at this point in the history
  3. Adds the new R&D boards to secure tech storage on all maps (ParadiseS…

    …S13#26722)
    
    * Adds some missing boards
    
    * I didnt forget cere
    AffectedArc07 authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    d8eb231 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d01fca6 View commit details
    Browse the repository at this point in the history
  5. Move global access procs to the mapping subsystem (ParadiseSS13#26664)

    * Move global access procs to the mapping subsystem
    
    * Apply requested changes
    m-dzianishchyts authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    a450ad9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f67dbca View commit details
    Browse the repository at this point in the history
  7. [FIX] Floorbots now actually use the colour of the toolbox they were …

    …made of (ParadiseSS13#26730)
    
    * Floorbots now actually use the colour of the toolbox they were made of
    
    * Remove random newline
    
    ---------
    
    Co-authored-by: Adrer <[email protected]>
    Adrer and Adrer authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    f7472de View commit details
    Browse the repository at this point in the history
  8. Various chemthrower fixes (ParadiseSS13#26697)

    * Various chemthrower fixes
    
    * Slight tweak
    
    * Fixes extended thrower
    
    * Fixes
    
    * Slight examine tweak
    
    * Name tweak and a fix
    DGamerL authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    62601ab View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7c3d87d View commit details
    Browse the repository at this point in the history
  10. Makes the cryo anomaly more dangerous (ParadiseSS13#26614)

    * Makes the cryo anomaly more dangerous
    
    * Reduces the amounts for vetus
    
    * Update code/game/objects/effects/anomalies.dm
    
    Signed-off-by: Luc <[email protected]>
    
    ---------
    
    Signed-off-by: Luc <[email protected]>
    Co-authored-by: Luc <[email protected]>
    DGamerL and lewcc authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    0a7873c View commit details
    Browse the repository at this point in the history
  11. Updates some salvage lore (ParadiseSS13#26595)

    * salvg
    
    * Update code/game/objects/items/salvage.dm
    
    Co-authored-by: CRUNCH <[email protected]>
    Signed-off-by: PopeDaveThe3th <[email protected]>
    
    * Update code/game/objects/items/salvage.dm
    
    Co-authored-by: Taurtura <[email protected]>
    Signed-off-by: PopeDaveThe3th <[email protected]>
    
    * Update code/game/objects/items/salvage.dm
    
    Co-authored-by: Taurtura <[email protected]>
    Signed-off-by: PopeDaveThe3th <[email protected]>
    
    ---------
    
    Signed-off-by: PopeDaveThe3th <[email protected]>
    Co-authored-by: CRUNCH <[email protected]>
    Co-authored-by: Taurtura <[email protected]>
    3 people authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    fe834bf View commit details
    Browse the repository at this point in the history
  12. Fixes and Changes for Devchat (ParadiseSS13#26726)

    * whatever the fuck brat summer is i guess
    
    * admins should get it too i guess
    
    * i forgor tgui build for lightmode
    
    * Update code/modules/admin/admin_verbs.dm
    
    Co-authored-by: BiancaWilkson <[email protected]>
    Signed-off-by: Contrabang <[email protected]>
    
    * Update code/modules/admin/admin_verbs.dm
    
    Signed-off-by: Contrabang <[email protected]>
    
    ---------
    
    Signed-off-by: Contrabang <[email protected]>
    Co-authored-by: BiancaWilkson <[email protected]>
    Contrabang and BiancaWilkson authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    809769b View commit details
    Browse the repository at this point in the history
  13. Captain's sabre - Resprite and rebrand (ParadiseSS13#26592)

    * rapier-rebrand
    
    * extdesc change
    
    * indentation
    
    * Update code/game/objects/items/weapons/melee/melee_misc.dm
    
    Co-authored-by: Burzah <[email protected]>
    Signed-off-by: Christasmurf <[email protected]>
    
    ---------
    
    Signed-off-by: Christasmurf <[email protected]>
    Co-authored-by: Burzah <[email protected]>
    Christasmurf and Burzah authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    1f9945e View commit details
    Browse the repository at this point in the history
  14. [SPRITES] Emissive mechs (ParadiseSS13#26589)

    * Emissive mechs
    
    * I accidentally touched the Durand
    
    * old_durand lightmask
    
    * Phazon open sprite upgrade
    
    * Move emissives to seperate file
    
    * Add unique emissives for dragon armour ripleys
    
    * Edge cases for updating overlays
    
    * Changed number to a define
    
    * Added Autodoc
    
    ---------
    
    Co-authored-by: [email protected] <[email protected]>
    Adrer and [email protected] authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6e36351 View commit details
    Browse the repository at this point in the history
  15. Conveyer belts and Disposals units no longer steal items on nonhelp i…

    …ntents (ParadiseSS13#26717)
    
    * no stealing batons
    
    * belts too
    
    * kick that unit
    HMBGERDO authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    2b90084 View commit details
    Browse the repository at this point in the history
  16. Adds Syndicate organizations (ParadiseSS13#24040)

    * framework
    
    * factions and objs done
    
    * objective framework
    
    * remove you_are, implement intro_desc
    
    * assassinate syndi text
    
    * remove extra space
    
    * Apply suggestions from code review
    
    Co-authored-by: DGamerL <[email protected]>
    
    * Implement steal items
    
    * Apply suggestions from code review
    
    Co-authored-by: DGamerL <[email protected]>
    Co-authored-by: Luc <[email protected]>
    
    * revert forced escape obj
    
    * rename i var
    
    * readd martyr check
    
    * difficulty defines
    
    * remove discounts
    
    * add electra dynamics
    
    * add hawkmoon
    
    * repath org, add gameplay blurbs
    
    * cuts unnecessary content, add org selection, updates
    
    * move defines
    
    * var names
    
    * update numbers
    
    * set defines, tweaks
    
    * add hijack forced obj
    
    * update L O R E
    
    * remove forgotten todo
    
    * document steal_list
    
    * use initial()
    
    * fix comments move steal objs
    
    * apply code review suggestions
    
    * use pickweight
    
    * flags
    
    * replace hardcoded target jobs by target_department
    
    * comment fix
    
    * incorporate org objectives into delayed objectives
    
    * fix martyr check location
    
    * Remove abuser vocab, debug names for orgs
    
    * readd obj name as user, VV only
    
    * add traitor panel and fix forced objective
    
    * reword ARC objective
    
    * change forced objective to list
    
    * rewrite to US spelling
    
    * Rework objective selection
    
    * Apply suggestions from code review
    
    Co-authored-by: Burzah <[email protected]>
    Signed-off-by: datlo <[email protected]>
    
    * add hunter notification, review stuff
    
    * Update code/game/gamemodes/objective.dm
    
    Co-authored-by: Ryan <[email protected]>
    Signed-off-by: datlo <[email protected]>
    
    * fix lists
    
    * Updated captain's sabre typepath
    
    Co-authored-by: Burzah <[email protected]>
    Signed-off-by: SteelSlayer <[email protected]>
    
    ---------
    
    Signed-off-by: datlo <[email protected]>
    Signed-off-by: SteelSlayer <[email protected]>
    Co-authored-by: DGamerL <[email protected]>
    Co-authored-by: Luc <[email protected]>
    Co-authored-by: Burzah <[email protected]>
    Co-authored-by: Ryan <[email protected]>
    Co-authored-by: SteelSlayer <[email protected]>
    6 people authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    20f47a7 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Farragus: Remaps Service Asteroid and Locker Room Area (ParadiseSS13#…

    …26493)
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Much Work
    
    * CI
    
    * OSHA Exit Sign
    
    * CI
    
    * CI
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * CI
    
    * CI
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Removed accidentally duplicated pipe.
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * CI
    
    * CI
    
    * Update cerestation.dmm
    
    * Update based on review
    
    * Makes all service intercoms into cardinal bumps
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * Update cerestation.dmm
    
    * fixes an errant loot spawner
    
    * Update cerestation.dmm
    
    * Moves bar electrical delivery wire to maint.
    
    ---------
    
    Co-authored-by: Burzah <[email protected]>
    Fordoxia and Burzah authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    9704445 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a71424d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a1e250c View commit details
    Browse the repository at this point in the history
  4. Adds map: EmeraldStation (NSS Diagoras) (ParadiseSS13#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 <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * 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 <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * Update code/game/turfs/simulated/floor/lava.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * Update code/game/area/ss13_areas/engineering_areas.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * Update code/game/objects/structures/plasma_geyser.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * Update code/game/turfs/simulated/floor/lava.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * Update code/game/objects/structures/plasma_geyser.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * 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 <[email protected]>
    Signed-off-by: Kyani <[email protected]>
    
    * 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 <[email protected]>
    Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
    Co-authored-by: Charlie Nolan <[email protected]>
    Co-authored-by: 1080pCat <[email protected]>
    Co-authored-by: AffectedArc07 <[email protected]>
    Co-authored-by: S34N <[email protected]>
    6 people authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    32719e2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3b5cbf5 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. The cloner once again mulches people on emag or emp (ParadiseSS13#26653)

    * The cloner once again mulches people on emag or emp
    
    * it has to be after each if, as the circuit board and beaker are passed as a stock part
    
    * Update code/game/machinery/clonepod.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Qwertytoforty <[email protected]>
    
    * Update code/game/machinery/clonepod.dm
    
    Co-authored-by: 1080pCat <[email protected]>
    Signed-off-by: Qwertytoforty <[email protected]>
    
    * merges it
    
    * istypesit
    
    ---------
    
    Signed-off-by: Qwertytoforty <[email protected]>
    Co-authored-by: 1080pCat <[email protected]>
    Qwertytoforty and 1080pCat authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    9c4a4c6 View commit details
    Browse the repository at this point in the history
  2. reflectors anchor on mapload (ParadiseSS13#26745)

    * anchors reflectors on 2 maps to not troll engineering
    
    * anchors on mapload
    Qwertytoforty authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    7be7ec7 View commit details
    Browse the repository at this point in the history
  3. Removes hoverboard from SOO starting inventory (ParadiseSS13#26661)

    * removes hoverboard from SOO
    
    * comma
    Coolrune206 authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    52442e6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    515d3eb View commit details
    Browse the repository at this point in the history
  5. fix squeak component (ParadiseSS13#26709)

    fixes ParadiseSS13#10334 "Blood crawling slaughter demons make rubber duckies squeak"
    fixes squeak component being confused about what is the crossed and what is the crossing atom
    prevents some potential runtimes in play_squeak_crossed
    Kenionatus authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    148eae5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e4d9337 View commit details
    Browse the repository at this point in the history
  7. Fixes missing Unanchored Gas Meter Item sprite (ParadiseSS13#26767)

    * Deletes old meter icon
    
    I HATE SPRITES THAT ARENT WITH THE REST OF THEM
    
    * Resprites GAS METER (Fixes unchanged icon)
    
    Hidden secret gas meter that isnt with every other gas meter
    ATP-Engineer authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    e571255 View commit details
    Browse the repository at this point in the history
  8. Paradise's soul removal part 7: engineering jumpsuits and accessories (

    …ParadiseSS13#26641)
    
    * Engineering jumpsuit resprite/refresh
    
    * Engineering berets resprite/refresh
    
    * CE mantle resprite
    
    * Grey CE pants consistency fix
    ElorgRHG authored Sep 14, 2024
    Configuration menu
    Copy the full SHA
    e2a7c80 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fc62bb3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    9c5f6ac View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    473b633 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7c970c4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    b0aabfe View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2a7aa64 View commit details
    Browse the repository at this point in the history