-
Notifications
You must be signed in to change notification settings - Fork 557
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/we…
…apons_overhaul
- Loading branch information
Showing
271 changed files
with
14,245 additions
and
10,069 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,5 +5,3 @@ | |
# Format is version: map | ||
# Example: | ||
# 500.1337: runtimestation | ||
|
||
515.1630: lv624 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
version: 1 | ||
byond: "514.1588" | ||
byond: "515.1627" | ||
static_files: | ||
- name: config | ||
- name: data | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// All of these must be matched in StripMenu.js. | ||
#define STRIPPABLE_ITEM_HEAD "head" | ||
#define STRIPPABLE_ITEM_BACK "back" | ||
#define STRIPPABLE_ITEM_MASK "wear_mask" | ||
#define STRIPPABLE_ITEM_EYES "glasses" | ||
#define STRIPPABLE_ITEM_L_EAR "wear_l_ear" | ||
#define STRIPPABLE_ITEM_R_EAR "wear_r_ear" | ||
#define STRIPPABLE_ITEM_JUMPSUIT "w_uniform" | ||
#define STRIPPABLE_ITEM_SUIT "wear_suit" | ||
#define STRIPPABLE_ITEM_GLOVES "gloves" | ||
#define STRIPPABLE_ITEM_FEET "shoes" | ||
#define STRIPPABLE_ITEM_SUIT_STORAGE "j_store" | ||
#define STRIPPABLE_ITEM_ID "id" | ||
#define STRIPPABLE_ITEM_BELT "belt" | ||
#define STRIPPABLE_ITEM_LPOCKET "l_store" | ||
#define STRIPPABLE_ITEM_RPOCKET "r_store" | ||
#define STRIPPABLE_ITEM_LHAND "l_hand" | ||
#define STRIPPABLE_ITEM_RHAND "r_hand" | ||
#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs" | ||
#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs" | ||
|
||
|
||
/// This slot is not obscured. | ||
#define STRIPPABLE_OBSCURING_NONE 0 | ||
|
||
/// This slot is completely obscured, and cannot be accessed. | ||
#define STRIPPABLE_OBSCURING_COMPLETELY 1 | ||
|
||
/// This slot can't be seen, but can be accessed. | ||
#define STRIPPABLE_OBSCURING_HIDDEN 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.