Code

Meet the Smith - New Supply Role#28273

Code

Open

PollardTheDragon wants to merge 134 commits intoParadiseSS13:masterParadiseSS13/Paradise:masterfrom PollardTheDragon:meet-the-smithPollardTheDragon/Paradise:meet-the-smithCopy head branch name to clipboard

+10,936-1,989

Commits

Commits on Jan 31, 2025

• Smith role, access, access helpers, spawn point, comms, and IDs

  PollardTheDragon

  committed
  289ba36

  Copy full SHA for 289ba36

• Area defines

  PollardTheDragon

  committed
  c1e1d1d

  Copy full SHA for c1e1d1d

Commits on Feb 1, 2025

• Hammertime

  PollardTheDragon

  committed
  dbe8e84

  Copy full SHA for dbe8e84

• Cyberiad Smith's office

  PollardTheDragon

  committed
  2ed12fa

  Copy full SHA for 2ed12fa

• Forgot some atmos stuff

  PollardTheDragon

  committed
  c6d710b

  Copy full SHA for c6d710b

• Autolathable Hammers

  PollardTheDragon

  committed
  525e2a8

  Copy full SHA for 525e2a8

• Formatting

  PollardTheDragon

  committed
  d2f9545

  Copy full SHA for d2f9545

• Toolbelts can hold hammers

  PollardTheDragon

  committed
  4ceffc2

  Copy full SHA for 4ceffc2

• Initial work on smith machines

  PollardTheDragon

  committed
  dcf7d33

  Copy full SHA for dcf7d33

• Farragus Smith Office

  PollardTheDragon

  committed
  1798ec2

  Copy full SHA for 1798ec2

• Placeholder sprites, mapping

  PollardTheDragon

  committed
  8cc66e3

  Copy full SHA for 8cc66e3

• Smart hopper points and console messages

  PollardTheDragon

  committed
  3311ffb

  Copy full SHA for 3311ffb

Commits on Feb 2, 2025

• More work on smithing machines

  PollardTheDragon

  committed
  2effb2f

  Copy full SHA for 2effb2f

• Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access

  PollardTheDragon

  committed
  adae7d4

  Copy full SHA for adae7d4

Commits on Feb 5, 2025

• Smith components, new materials

  PollardTheDragon

  committed
  57646be

  Copy full SHA for 57646be

Commits on Feb 6, 2025

• New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation

  PollardTheDragon

  committed
  076c274

  Copy full SHA for 076c274

• Missed one

  PollardTheDragon

  committed
  b3a34ee

  Copy full SHA for b3a34ee

Commits on Feb 7, 2025

• Merge remote-tracking branch 'upstream/master' into meet-the-smith

  PollardTheDragon

  committed
  1d50bf1

  Copy full SHA for 1d50bf1

• Grrr map conflicts begone

  PollardTheDragon

  committed
  0ce6567

  Copy full SHA for 0ce6567

• Dirt begone

  PollardTheDragon

  committed
  3888037

  Copy full SHA for 3888037

• Casts and smelting

  PollardTheDragon

  committed
  c4e075b

  Copy full SHA for c4e075b

• Linters

  PollardTheDragon

  committed
  ab83b82

  Copy full SHA for ab83b82

• Attack chain linters!

  PollardTheDragon

  committed
  4582f1c

  Copy full SHA for 4582f1c

• Better grip to throw people into your industrial machines

  PollardTheDragon

  committed
  4e20e26

  Copy full SHA for 4e20e26

• Placeholder spots in the DMIs

  PollardTheDragon

  committed
  0e076e8

  Copy full SHA for 0e076e8

Commits on Feb 8, 2025

• UpdatePaths - Space ruins now spawn new space ores in their rocks

  PollardTheDragon

  committed
  ace3007

  Copy full SHA for ace3007

• Small changes - removed excess tgui code from hopper

  PollardTheDragon

  committed
  5590d57

  Copy full SHA for 5590d57

• Fixed a button on emerald

  PollardTheDragon

  committed
  af18365

  Copy full SHA for af18365

Commits on Feb 9, 2025

• Attaching inserts and lenses. Tool bits are pain.

  PollardTheDragon

  committed
  02ee3bc

  Copy full SHA for 02ee3bc

Commits on Feb 11, 2025

• Tool bit initial implementation

  PollardTheDragon

  committed
  f291945

  Copy full SHA for f291945

• Merge remote-tracking branch 'upstream/master' into meet-the-smith

  PollardTheDragon

  committed
  299bb3d

  Copy full SHA for 299bb3d

• Merge conflict resolution

  PollardTheDragon

  committed
  af905ce

  Copy full SHA for af905ce

• Attack chain grrr

  PollardTheDragon

  committed
  3cceef1

  Copy full SHA for 3cceef1

• Fixed a pair of minor mapping issues

  PollardTheDragon

  committed
  91fbeaa

  Copy full SHA for 91fbeaa

Commits on Feb 12, 2025

• Tool bit implementation, efficiency, failure rate

  PollardTheDragon

  committed
  ceb8513

  Copy full SHA for ceb8513

• Hot things burn hands

  PollardTheDragon

  committed
  3d7f0c2

  Copy full SHA for 3d7f0c2

• Points fix on hopper

  PollardTheDragon

  committed
  83ff522

  Copy full SHA for 83ff522

Commits on Feb 13, 2025

• New mining rocks for space exploration

  PollardTheDragon

  committed
  6ebdad9

  Copy full SHA for 6ebdad9

• Areas on asteroids

  PollardTheDragon

  committed
  324b12b

  Copy full SHA for 324b12b

• Machinery icons 1

  Show description for bc4d2e5
  ExusA

  committed
  bc4d2e5

  Copy full SHA for bc4d2e5

• Vendor iconstate update

  ExusA

  committed
  cfc0ff2

  Copy full SHA for cfc0ff2

• Crucible touchups

  ExusA

  committed
  bc35726

  Copy full SHA for bc35726

• Hammer touchups

  ExusA

  committed
  53243cf

  Copy full SHA for 53243cf

• Crucible Input Animation

  Show description for 1219108
  ExusA

  committed
  1219108

  Copy full SHA for 1219108

Commits on Feb 16, 2025

• Added scanning the crucible with multitool to get mineral count

  PollardTheDragon

  committed
  8f22c2a

  Copy full SHA for 8f22c2a

Commits on Feb 17, 2025

• clothing sprites part 1

  Christasmurf

  committed
  fcbeaf9

  Copy full SHA for fcbeaf9

• locker sprite

  Christasmurf

  committed
  c942b42

  Copy full SHA for c942b42

• job icons

  Christasmurf

  committed
  d8d6754

  Copy full SHA for d8d6754

• garment bag

  Christasmurf

  committed
  d5a2b49

  Copy full SHA for d5a2b49

• Smith locker mapping

  PollardTheDragon

  committed
  c6a3680

  Copy full SHA for c6a3680

• Insert and Bit removal fix

  PollardTheDragon

  committed
  1f0039b

  Copy full SHA for 1f0039b

• Job menu alignment fix, Allowed_items and small spriting path fixes

  PollardTheDragon

  committed
  a6e7484

  Copy full SHA for a6e7484

• Adds new asteroid ruins to config

  PollardTheDragon

  committed
  e5b9c79

  Copy full SHA for e5b9c79

• Ore Sprites

  ExusA

  committed
  5464dfb

  Copy full SHA for 5464dfb

• Hammer Sprite

  ExusA

  committed
  b58d86f

  Copy full SHA for b58d86f

Commits on Feb 19, 2025

• Item Sprites 1

  ExusA

  committed
  0091601

  Copy full SHA for 0091601

• Sheets, Wall Ores and Trim

  ExusA

  committed
  bf79980

  Copy full SHA for bf79980

• Sheet iconstate names

  ExusA

  committed
  544401a

  Copy full SHA for 544401a

• species uniforms

  Christasmurf

  committed
  4c82a7a

  Copy full SHA for 4c82a7a

Commits on Feb 20, 2025

• Tabs

  Show description for 8298360
  

  PollardTheDragon

  and

  lewcc

  authored
  8298360

  Copy full SHA for 8298360

• Lens spelling fix

  PollardTheDragon

  committed
  4256148

  Copy full SHA for 4256148

• Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs

  PollardTheDragon

  committed
  8f38df9

  Copy full SHA for 8f38df9

• Fixed type lists

  PollardTheDragon

  committed
  b0ec623

  Copy full SHA for b0ec623

• Smithing machine bug fixes.

  PollardTheDragon

  committed
  ffc2a75

  Copy full SHA for ffc2a75

• Fixed adding modifications to items

  PollardTheDragon

  committed
  67972ef

  Copy full SHA for 67972ef

• Crucible Lava Idle

  Show description for 816652e
  ExusA

  committed
  816652e

  Copy full SHA for 816652e

• Fixed eguns

  PollardTheDragon

  committed
  368b4e9

  Copy full SHA for 368b4e9

• Merge branch 'meet-the-smith' of https://github.com/PollardTheDragon/Paradise into meet-the-smith

  PollardTheDragon

  committed
  3f5a4ed

  Copy full SHA for 3f5a4ed

Commits on Feb 22, 2025

• Magma Crucible overlays and animations

  PollardTheDragon

  committed
  5b75be8

  Copy full SHA for 5b75be8

Commits on Feb 23, 2025

• Machine broken/Off states

  Show description for 98fcdee
  ExusA

  committed
  98fcdee

  Copy full SHA for 98fcdee

• Castivend recolor and Hot Items

  ExusA

  committed
  84ad250

  Copy full SHA for 84ad250

• Overlays for all machines, new sprites for hot items, new checks, fixes

  PollardTheDragon

  committed
  32c9c48

  Copy full SHA for 32c9c48

• Merge remote-tracking branch 'upstream/master' into meet-the-smith

  PollardTheDragon

  committed
  7467861

  Copy full SHA for 7467861

• Woe, farragus merge conflict

  PollardTheDragon

  committed
  e36e19a

  Copy full SHA for e36e19a

• update_appearance linters

  PollardTheDragon

  committed
  3cccb5e

  Copy full SHA for 3cccb5e

• I have fat fingers.

  PollardTheDragon

  committed
  75a1f40

  Copy full SHA for 75a1f40

• Forgot one

  PollardTheDragon

  committed
  e567875

  Copy full SHA for e567875

Commits on Feb 24, 2025

• transfer_item_to and qdel null check

  PollardTheDragon

  committed
  680ac26

  Copy full SHA for 680ac26

• Usr to User

  PollardTheDragon

  committed
  316c290

  Copy full SHA for 316c290

• Modsuits should not have inserts.

  PollardTheDragon

  committed
  9dd372f

  Copy full SHA for 9dd372f

• Adds casting lip overlay

  PollardTheDragon

  committed
  5914f60

  Copy full SHA for 5914f60

• Balance pass on movement debuffs and buffs

  PollardTheDragon

  committed
  3f35805

  Copy full SHA for 3f35805

• Material movespeed changes

  PollardTheDragon

  committed
  084a642

  Copy full SHA for 084a642

Commits on Feb 26, 2025

• Merge branch 'master' into meet-the-smith

  PollardTheDragon

  authored
  775e126

  Copy full SHA for 775e126

Commits on Feb 27, 2025

• Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE

  PollardTheDragon

  committed
  623ed7a

  Copy full SHA for 623ed7a

Commits on Feb 28, 2025

• Math fixes for lenses and bits.

  PollardTheDragon

  committed
  b59603a

  Copy full SHA for b59603a

• Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums

  PollardTheDragon

  committed
  d448ffc

  Copy full SHA for d448ffc

• Bad var. Bad.

  PollardTheDragon

  committed
  c58b715

  Copy full SHA for c58b715

• Various fixes to bugs revealed in initial TM

  PollardTheDragon

  committed
  12b8131

  Copy full SHA for 12b8131

• TYPO

  PollardTheDragon

  committed
  6f9ec6b

  Copy full SHA for 6f9ec6b

• Lavaland base turf fix

  PollardTheDragon

  committed
  d06f544

  Copy full SHA for d06f544

• Paths in examine fix

  PollardTheDragon

  committed
  b0857a3

  Copy full SHA for b0857a3

• Adds an intercom to the workshop.

  PollardTheDragon

  committed
  7b6256a

  Copy full SHA for 7b6256a

• Stamina-hybrid damage oversight fix for det revolver, uion, etc.

  PollardTheDragon

  committed
  fb3369f

  Copy full SHA for fb3369f

• Currently Operating Message fix

  PollardTheDragon

  committed
  f61d5ab

  Copy full SHA for f61d5ab

• Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.

  PollardTheDragon

  committed
  536607d

  Copy full SHA for 536607d

• Armor and upgrade fixes

  PollardTheDragon

  committed
  3714e52

  Copy full SHA for 3714e52

• RCD tool bit equip fix

  PollardTheDragon

  committed
  20c49b2

  Copy full SHA for 20c49b2

• Adds smith access to a few lists in access.dm that were missed in an oversight

  PollardTheDragon

  committed
  e4af001

  Copy full SHA for e4af001

• Indent fixes

  PollardTheDragon

  committed
  c6b4978

  Copy full SHA for c6b4978

• Fixes vending machine, allows tool bit use on mining equipment

  PollardTheDragon

  committed
  d55cb2b

  Copy full SHA for d55cb2b

• CI, you make me mad sometimes

  PollardTheDragon

  committed
  3193c06

  Copy full SHA for 3193c06

• Removed duplicate code

  PollardTheDragon

  committed
  ddf2cd7

  Copy full SHA for ddf2cd7

• Name fix for CI again

  PollardTheDragon

  committed
  cd3b5a6

  Copy full SHA for cd3b5a6

• Merge remote-tracking branch 'upstream/master' into meet-the-smith

  PollardTheDragon

  committed
  caea7dc

  Copy full SHA for caea7dc

• ORM now can handle space ores

  PollardTheDragon

  committed
  c39235c

  Copy full SHA for c39235c

• Adds space ores to Vetus drop and to trader inventories

  PollardTheDragon

  committed
  adee90d

  Copy full SHA for adee90d

• Fixes runtime with open hand attacking a lava furnace with nothing in it

  PollardTheDragon

  committed
  ef328a9

  Copy full SHA for ef328a9

• Adds crewvend kit to Castivend

  PollardTheDragon

  committed
  71d9075

  Copy full SHA for 71d9075

• Fixes not being able to see new ores

  PollardTheDragon

  committed
  a14ce51

  Copy full SHA for a14ce51

• Adds drill and RCS to smith locker

  PollardTheDragon

  committed
  1826e0a

  Copy full SHA for 1826e0a

Commits on Mar 1, 2025

• Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.

  PollardTheDragon

  committed
  779b8fc

  Copy full SHA for 779b8fc

• Plant fixes

  PollardTheDragon

  committed
  28c4710

  Copy full SHA for 28c4710

• Fixes doubled-up catwalk

  PollardTheDragon

  committed
  0c349b3

  Copy full SHA for 0c349b3

• Emerald cargo windoor fix, small lavaland adjustment

  PollardTheDragon

  committed
  d4ec9be

  Copy full SHA for d4ec9be

• Small oversight for overlay fix

  PollardTheDragon

  committed
  8af650e

  Copy full SHA for 8af650e

Commits on Mar 2, 2025

• Missing lightswitches

  PollardTheDragon

  committed
  d2d5559

  Copy full SHA for d2d5559

• Fixed stock parts mismatch in casting basin recipe

  PollardTheDragon

  committed
  7e91f36

  Copy full SHA for 7e91f36

• Better support for power tools, grrr attackchain

  PollardTheDragon

  committed
  a8859e3

  Copy full SHA for a8859e3

• Better attack chain handling. Better handling for bit insertion

  PollardTheDragon

  committed
  9652461

  Copy full SHA for 9652461

• Fixes handling of inserts with storage suits (like labcoats)

  PollardTheDragon

  committed
  3bc4d03

  Copy full SHA for 3bc4d03

• sprites for bomber + plasmeme outfit

  Christasmurf

  committed
  cba4869

  Copy full SHA for cba4869

• Adds missing adjacency checks

  PollardTheDragon

  committed
  d29b69b

  Copy full SHA for d29b69b

• Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.

  PollardTheDragon

  committed
  46ae158

  Copy full SHA for 46ae158

• Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.

  PollardTheDragon

  committed
  7fd9777

  Copy full SHA for 7fd9777

• Small hallway adjustment

  PollardTheDragon

  committed
  06a3962

  Copy full SHA for 06a3962

Commits on Mar 3, 2025

• Illuminates metastation smith office

  PollardTheDragon

  committed
  fa21a48

  Copy full SHA for fa21a48

• Removes excessive decimals in magma crucible scan output

  PollardTheDragon

  committed
  02b65bf

  Copy full SHA for 02b65bf

Commits on Mar 4, 2025

• Berserker should not have inserts.

  PollardTheDragon

  committed
  addabe8

  Copy full SHA for addabe8

• Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly

  PollardTheDragon

  committed
  7d7145f

  Copy full SHA for 7d7145f

• Adds smith bomber jacket to loadout panel

  PollardTheDragon

  committed
  050393f

  Copy full SHA for 050393f

• Adds random spawners for smithed items, adds random low-quality items to maints loot

  PollardTheDragon

  committed
  63afca4

  Copy full SHA for 63afca4

Commits on Mar 6, 2025

• Adds traitor version of bulldog shotgun

  PollardTheDragon

  committed
  1d39c59

  Copy full SHA for 1d39c59

• Revert "Adds traitor version of bulldog shotgun"

  Show description for 41f3114
  PollardTheDragon

  committed
  41f3114

  Copy full SHA for 41f3114