Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Jul 28, 2024
1 parent d7906fa commit 2b845cc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
12 changes: 10 additions & 2 deletions code/__DEFINES/materials/parts.dm
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
//* This file is explicitly licensed under the MIT license. *//
//* Copyright (c) 2023 Citadel Station developers. *//

//* material part enums *//

/// material part key that a single-material-part object is treated as having
#define MATERIAL_PART_DEFAULT "structure"

//* material id enums for lookups during materials init of an entity *//

/// material ID to pass to Initialize() procs for "erase the default material of this slot"
#define MATERIAL_ID_ERASE "___ERASE___"

//* material_parts var - defaults *//

/// material_parts value for object does not use material parts system
#define MATERIAL_DEFAULT_DISABLED "DISABLED"
/// material_parts value for object uses hardcoded vars / overrides the abstraction API
#define MATERIAL_DEFAULT_ABSTRACTED "ABSTRACTED"
/// material_parts value for object has a single material but it's absent
#define MATERIAL_DEFAULT_NONE null
/// material ID to pass to Initialize() procs for "erase the default material of this slot"
#define MATERIAL_ID_ERASE "___ERASE___"
4 changes: 2 additions & 2 deletions code/controllers/subsystem/supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ SUBSYSTEM_DEF(supply)
if(!container)
continue
if(SO.comment)
container.name += " [SO.comment]"
container.name += " ([SO.comment])"

// Supply manifest generation begin
var/obj/item/paper/manifest/slip
Expand Down Expand Up @@ -471,7 +471,7 @@ SUBSYSTEM_DEF(supply)
break
return
for(var/i in 1 to min(amount, 50))
new descriptor(location, i)
new descriptor(location)

/**
* Resolves an entity descriptor, and describes it with a string
Expand Down

0 comments on commit 2b845cc

Please sign in to comment.