Code

merge upstream#639

Code

Closed

Legendaxe wants to merge 48 commits intoss220club:masterss220club/Paradise-SS220:masterfrom ParadiseSS13:masterParadiseSS13/Paradise:masterCopy head branch name to clipboard

+44,982-30,046

Commits

Commits on Nov 2, 2023

• Sprite: Stage 1 - Cleanup - AIBOTS (#23089)

  Show description for 46324fb
  Oyu07

  authored
  46324fb

  Copy full SHA for 46324fb

• Fixes BoxStation Stacking Machine, while adding a Stacking Machine in CereStation (#22917)

  Show description for fb4c134
  SchrodingersWolf

  authored
  fb4c134

  Copy full SHA for fb4c134

• Reworks xenomorph space ruin: Moonoutpost19 (#22784)

  Show description for 5fe9b37
  

  3 peopleauthored
  5fe9b37

  Copy full SHA for 5fe9b37

• removes Supply SoP from the HoP's office (#22960)

  bakaf

  authored
  7321d08

  Copy full SHA for 7321d08

Commits on Nov 3, 2023

• CPR effectiveness messages now properly reflect effectiveness (#23106)

  Show description for bcaa4e5
  

  3 peopleauthored
  bcaa4e5

  Copy full SHA for bcaa4e5

• Changes darkblessing inhand file to proper one (#23133)

  Show description for 2bf4617
  

  Adrer

  and

  Adrer

  authored
  2bf4617

  Copy full SHA for 2bf4617

• Adds a chat box + bwoink sound to the Admin Message Antagonist Team button (#23078)

  Show description for b2600f7
  

  3 peopleauthored
  b2600f7

  Copy full SHA for b2600f7

• Fix crew not in accurate positions in crew monitor (#23098)

  Show description for c247e17
  

  Arthri

  and

  github-actions[bot]

  authored
  c247e17

  Copy full SHA for c247e17

• Salad Description Adjustment (#23103)

  Show description for adbfe5e
  

  Terilia

  and

  DGamerL

  authored
  adbfe5e

  Copy full SHA for adbfe5e

• Fixes dir flip (#23116)

  Show description for 951d04f
  

  Adrer

  and

  [email protected]

  authored
  951d04f

  Copy full SHA for 951d04f

• NanoMap Auto-Update (Fri Nov 3 01:09:40 UTC 2023) (#23129)

  Show description for f327f32
  

  github-actions[bot]

  and

  actions-user

  authored
  f327f32

  Copy full SHA for f327f32

• Fixes analyzer chat message visibility (#23126)

  Show description for 569389b
  Bjamcham

  authored
  569389b

  Copy full SHA for 569389b

• Make Syringe Guns shoot Syringes in Inject mode (#23088)

  Show description for 279071a
  Arthri

  authored
  279071a

  Copy full SHA for 279071a

• Autohiss now properly capitalized (#23105)

  Show description for 680b930
  

  3 peopleauthored
  680b930

  Copy full SHA for 680b930

• Gives syndicate infiltrators basic engineering access (#23124)

  Show description for 6c7067d
  

  Adrer

  and

  [email protected]

  authored
  6c7067d

  Copy full SHA for 6c7067d

• pacifistem and dumb mistakes (#23125)

  Qwertytoforty

  authored
  eb3d953

  Copy full SHA for eb3d953

• ISSUE TEMPLATES: Moves to boxes - Uses new github issue templates (#23091)

  Show description for 8b4166a
  

  Oyu07

  and

  Contrabang

  authored
  8b4166a

  Copy full SHA for 8b4166a

• PDA: You can now select ringtones from a preset list (#22977)

  Show description for d7a546d
  

  Henri215

  and

  Sirryan2002

  authored
  d7a546d

  Copy full SHA for d7a546d

• Lavaland Seed Vault - fixing oversights. (#23076)

  Show description for 1526f3b
  Venuska1117

  authored
  1526f3b

  Copy full SHA for 1526f3b

• Morgue tray now updates properly (#23109)

  Show description for aa7ea39
  

  Adrer

  and

  Adrer

  authored
  aa7ea39

  Copy full SHA for aa7ea39

• Bump browserify-sign from 4.2.1 to 4.2.2 in /tgui (#23061)

  Show description for 1b5dd41
  dependabot[bot]

  authored
  1b5dd41

  Copy full SHA for 1b5dd41

• Adds SS loading to title screen (#23042)

  Show description for 558f129
  AffectedArc07

  authored
  558f129

  Copy full SHA for 558f129

• makes the lwap not pierce infinite r_walls, pierces resin like walls (#22983)

  Show description for 2c61fda
  Qwertytoforty

  authored
  2c61fda

  Copy full SHA for 2c61fda

• Bump @babel/traverse from 7.17.10 to 7.23.2 in /tgui (#22938)

  Show description for 36df4f2
  

  dependabot[bot]

  and

  S34NW

  authored
  36df4f2

  Copy full SHA for 36df4f2

• move 'Jump to Ruin' from an admin to a ghost verb (#22953)

  Show description for 1ed0f76
  warriorstar-orion

  authored
  1ed0f76

  Copy full SHA for 1ed0f76

• fixes radios doubling up on frequency sometimes (#22963)

  GDNgit

  authored
  4647342

  Copy full SHA for 4647342

• Turns isholy into a trait and adds a trait mind helper (#23107)

  Show description for abe4110
  ppi13

  authored
  abe4110

  Copy full SHA for abe4110

• Adds HUD goggles and basic goggles (#22864)

  Show description for 8e6defe
  

  3 peopleauthored
  8e6defe

  Copy full SHA for 8e6defe

• Adds EMP weakness to welding shield eyes (#22928)

  Show description for 4bde2cf
  

  3 peopleauthored
  4bde2cf

  Copy full SHA for 4bde2cf

• Adds camera bug camera network to restricted_camera_networks (#23135)

  Show description for 87f0337
  

  Adrer

  and

  Adrer

  authored
  87f0337

  Copy full SHA for 87f0337

• Bugfix/issue 22899/vendor restocking unit's description is misleading (#23130)

  Show description for 7646af5
  

  bakaf

  and

  lewcc

  authored
  7646af5

  Copy full SHA for 7646af5

• fixes pdas not being able to have their ids removed/added while on the ground (#22642)

  Show description for 7c1a3a3
  

  3 peopleauthored
  7c1a3a3

  Copy full SHA for 7c1a3a3

• Moved ChickenBall sprite from SoupSalad.dmi to meats.dmi (#23101)

  Show description for 1a92fc2
  

  3 peopleauthored
  1a92fc2

  Copy full SHA for 1a92fc2

Commits on Nov 4, 2023

• Space Ruin: Rework Syndie Research Base (#22721)

  Show description for d24f774
  Venuska1117

  authored
  d24f774

  Copy full SHA for d24f774

• Ezpz (#23145)

  DGamerL

  authored
  c7fcee6

  Copy full SHA for c7fcee6

• Refactor: Floorbot Overlay + Sprite Reduction (#23081)

  Show description for f01e3de
  Oyu07

  authored
  f01e3de

  Copy full SHA for f01e3de

• Active job bans are displayed to players when they join the lobby (#22732)

  Show description for ec21a77
  S34NW

  authored
  ec21a77

  Copy full SHA for ec21a77

• Modernises issue reports using templates. (#23104)

  Show description for a959630
  

  S34NW

  and

  DGamerL

  authored
  a959630

  Copy full SHA for a959630

• Adds "Teach them a lesson" Objective (traitor only) (#22933)

  Show description for 14fbf2b
  Aquilar

  authored
  14fbf2b

  Copy full SHA for 14fbf2b

• Changes the powerfist to work off pressure (#23069)

  Show description for 29351ef
  Bjamcham

  authored
  29351ef

  Copy full SHA for 29351ef

• Belts and some select belt slot items no longer require a jumpsuit to wear (#23038)

  Show description for e6addfc
  SchrodingersWolf

  authored
  e6addfc

  Copy full SHA for e6addfc

• Adds soil clumps and a compost bin. (#22585)

  Show description for 23e2c25
  

  4 peopleauthored
  23e2c25

  Copy full SHA for 23e2c25

• Service borgs get a multi pen instead of a regular (#23128)

  Show description for 7cd360c
  alien3301

  authored
  7cd360c

  Copy full SHA for 7cd360c

Commits on Nov 5, 2023

• fix conflict marker creation (#23165)

  warriorstar-orion

  authored
  50e0665

  Copy full SHA for 50e0665

• Icon switch (#23146)

  Bjamcham

  authored
  685df10

  Copy full SHA for 685df10

Commits on Nov 6, 2023

• Adds Whistles to the game (#22729)

  Show description for bc095ad
  Henri215

  authored
  bc095ad

  Copy full SHA for bc095ad

Commits on Nov 7, 2023

• Whoopsie (#23180)

  DGamerL

  authored
  635dd52

  Copy full SHA for 635dd52

• Fixes overlay issues. (#23186)

  Show description for 400661b
  

  Adrer

  and

  Adrer

  authored
  400661b

  Copy full SHA for 400661b