Skip to content

Commit 881691c

Browse files
Andrew-FallAndrew-Fall
authored
Merge pull request #249 from NataKilar/nov-nebula-merge
November Nebula merge [IDB IGNORE] [MDB IGNORE]
2 parents f3d87e3 + b9c4919 commit 881691c

1,988 files changed

Lines changed: 69396 additions & 40748 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.git-blame-ignore-revs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# git blame master ignore list.
2+
#
3+
# This file contains a list of git hashes of revisions to be ignored by git
4+
# blame. These revisions are considered "unimportant" in that they
5+
# are unlikely to be what you are interested in when blaming.
6+
#
7+
# Requires git 2.23 or later (or equivalent)
8+
# To enable, execute: git config blame.ignoreRevsFile .git-blame-ignore-revs
9+
#
10+
# Instructions:
11+
# - Only large (generally automated) reformatting or renaming CLs should be
12+
# added to this list. Do not put things here just because you feel they are
13+
# trivial or unimportant. If in doubt, do not put it on this list.
14+
# - Precede each revision with a comment containing the first line of its log.
15+
# For bulk work over many commits, place all commits in a block with a single
16+
# comment at the top describing the work done in those commits.
17+
# - Only put full 40-character hashes on this list (not short hashes or any
18+
# other revision reference).
19+
# - Append to the bottom of the file (revisions should be in chronological order
20+
# from oldest to newest).
21+
# - Because you must use a hash, you need to append to this list in a follow-up
22+
# CL to the actual reformatting CL that you are trying to ignore.
23+
24+
# Major whitespace changes but nothing else
25+
51e1a662317e4fc5f4048bbd19375e46187dd91b
26+
bf996203dfc4b09f8dc4dd73b532f9ee49691776
27+
bfa20cdc17d1794969331c4272c4a8d7ad523a44

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- We recommend to check the contributing page before opening pull requests. -->
22
<!-- https://github.com/NebulaSS13/Nebula/blob/dev/CONTRIBUTING.md -->
33

4+
<!-- !! PLEASE, READ THIS !! -->
5+
<!-- If you opening a pull request which changes A LOT icon/map files: -->
6+
<!-- Add [IDB IGNORE] (to ignore icon files diff) or [MDB IGNORE] (to ignore map files diff) in PR title. -->
7+
<!-- These tags created to prevent parsing a huge diffs and not overload IconDiffBot and MapDiffBot. -->
8+
49
## Description of changes
510

611
<!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! -->

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
- name: Install Dreamchecker
3232
run: scripts/install-spaceman-dmm.sh dreamchecker
3333
- name: Run Dreamchecker
34-
run: ~/dreamchecker 2>&1 | tee ${GITHUB_WORKSPACE}/output-annotations.txt
34+
run: |
35+
set -o pipefail
36+
~/dreamchecker 2>&1 | tee ${GITHUB_WORKSPACE}/output-annotations.txt
3537
- name: Annotate Lints
3638
uses: yogstation13/DreamAnnotate@34029606cd7c22a08a589e084f860c1cc287363c
3739
if: always()

‎.vscode/settings.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
},
66
"files.associations": {
77
"*.tmpl": "html"
8-
}
8+
},
9+
"gitlens.advanced.blame.customArguments": [
10+
"--ignore-revs-file",
11+
".git-blame-ignore-revs"
12+
]
913
}

‎code/__defines/_compile_helpers.dm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
#define BITFLAG(X) (1<<(X))
1+
#define BITSHIFT_LEFT(X, N) (X << (N))
2+
#define BITSHIFT_RIGHT(X, N) (X >> (N))
3+
#define BITFLAG(X) BITSHIFT_LEFT(1, X)

‎code/__defines/_planes+layers.dm‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,3 @@ What is the naming convention for planes or layers?
189189
#define HUD_ITEM_LAYER 3
190190
#define HUD_ABOVE_ITEM_LAYER 4
191191
#define HUD_ABOVE_HUD_LAYER 5
192-
193-
/atom
194-
plane = DEFAULT_PLANE
195-
196-
/atom/proc/hud_layerise()
197-
plane = HUD_PLANE
198-
layer = HUD_ITEM_LAYER
199-
200-
/atom/proc/reset_plane_and_layer()
201-
plane = initial(plane)
202-
layer = initial(layer)

‎code/__defines/admin.dm‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// A set of constants used to determine which type of mute an admin wishes to apply.
2-
// Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO, etc. = (MUTE_IC << 1)
2+
// Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO, etc.
33
// Therefore there needs to be a gap between the flags for the automute flags.
44
#define MUTE_IC BITFLAG(0)
55
#define MUTE_OOC BITFLAG(1)
@@ -48,4 +48,13 @@
4848
#define TICKET_ASSIGNED 2 // An admin has assigned themself to the ticket and will respond
4949

5050
#define LAST_CKEY(M) (M.ckey || M.last_ckey)
51-
#define LAST_KEY(M) (M.key || M.last_ckey)
51+
#define LAST_KEY(M) (M.key || M.last_ckey)
52+
53+
///Max length of a keypress command before it's considered to be a forged packet/bogus command
54+
#define MAX_KEYPRESS_COMMANDLENGTH 16
55+
///Maximum keys that can be bound to one button
56+
#define MAX_COMMANDS_PER_KEY 5
57+
///Maximum keys per keybind
58+
#define MAX_KEYS_PER_KEYBIND 3
59+
///Length of held key buffer
60+
#define HELD_KEY_BUFFER_LENGTH 15

‎code/__defines/ao_misc.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Define for getting a bitfield of adjacent turfs that meet a condition.
99
CALCULATE_NEIGHBORS(src, result, T, isopenturf(T))
1010
*/
1111
#define CALCULATE_NEIGHBORS(ORIGIN, VAR, TVAR, FUNC) \
12-
for (var/_tdir in global.cardinal) { \
12+
for (var/_tdir in global.cardinal) { \
1313
TVAR = get_step(ORIGIN, _tdir); \
1414
if ((TVAR) && (FUNC)) { \
15-
VAR |= 1 << _tdir; \
15+
VAR |= BITFLAG(_tdir); \
1616
} \
1717
} \
1818
if (VAR & N_NORTH) { \

‎code/__defines/aspects.dm‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,50 @@
1111
#define ASPECTS_PHYSICAL BITFLAG(0)
1212
#define ASPECTS_MENTAL BITFLAG(1)
1313

14-
#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, MODEL_NAME, COST) \
14+
#define DEFINE_ROBOLIMB_MODEL_ASPECTS(MODEL_PATH, MODEL_ID, COST) \
1515
/decl/aspect/prosthetic_limb/left_hand/##MODEL_ID { \
16-
name = MODEL_NAME + " Left Hand"; \
1716
model = MODEL_PATH; \
1817
parent = /decl/aspect/prosthetic_limb/left_hand; \
1918
aspect_cost = COST; \
2019
base_type = /decl/aspect/prosthetic_limb/left_hand; \
2120
} \
2221
/decl/aspect/prosthetic_limb/left_arm/##MODEL_ID { \
23-
name = MODEL_NAME + " Left Arm"; \
2422
model = MODEL_PATH; \
2523
parent = /decl/aspect/prosthetic_limb/left_arm; \
2624
aspect_cost = COST; \
2725
base_type = /decl/aspect/prosthetic_limb/left_arm; \
2826
} \
2927
/decl/aspect/prosthetic_limb/right_hand/##MODEL_ID { \
30-
name = MODEL_NAME + " Right Hand"; \
3128
model = MODEL_PATH; \
3229
parent = /decl/aspect/prosthetic_limb/right_hand; \
3330
aspect_cost = COST; \
3431
base_type = /decl/aspect/prosthetic_limb/right_hand; \
3532
} \
3633
/decl/aspect/prosthetic_limb/right_arm/##MODEL_ID { \
37-
name = MODEL_NAME + " Right Arm"; \
3834
model = MODEL_PATH; \
3935
parent = /decl/aspect/prosthetic_limb/right_arm; \
4036
aspect_cost = COST; \
4137
base_type = /decl/aspect/prosthetic_limb/right_arm; \
4238
} \
4339
/decl/aspect/prosthetic_limb/left_foot/##MODEL_ID { \
44-
name = MODEL_NAME + " Left Foot"; \
4540
model = MODEL_PATH; \
4641
parent = /decl/aspect/prosthetic_limb/left_foot; \
4742
aspect_cost = COST; \
4843
base_type = /decl/aspect/prosthetic_limb/left_foot; \
4944
} \
5045
/decl/aspect/prosthetic_limb/left_leg/##MODEL_ID { \
51-
name = MODEL_NAME + " Left Leg"; \
5246
model = MODEL_PATH; \
5347
parent = /decl/aspect/prosthetic_limb/left_leg; \
5448
base_type = /decl/aspect/prosthetic_limb/left_leg; \
5549
aspect_cost = COST; \
5650
} \
5751
/decl/aspect/prosthetic_limb/right_foot/##MODEL_ID { \
58-
name = MODEL_NAME + " Right Foot"; \
5952
model = MODEL_PATH; \
6053
parent = /decl/aspect/prosthetic_limb/right_foot; \
6154
base_type = /decl/aspect/prosthetic_limb/right_foot; \
6255
aspect_cost = COST; \
6356
} \
6457
/decl/aspect/prosthetic_limb/right_leg/##MODEL_ID { \
65-
name = MODEL_NAME + " Right Leg"; \
6658
model = MODEL_PATH; \
6759
parent = /decl/aspect/prosthetic_limb/right_leg; \
6860
base_type = /decl/aspect/prosthetic_limb/right_leg; \

‎code/__defines/chemistry.dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
#define CE_VOICELOSS "whispers" // Lowers the subject's voice to a whisper
3939
#define CE_GLOWINGEYES "eyeglow" // Causes eyes to glow.
4040

41+
#define CE_REGEN_BRUTE "bruteheal" // Causes brute damage to regenerate.
42+
#define CE_REGEN_BURN "burnheal" // Causes burn damage to regenerate.
43+
4144
#define GET_CHEMICAL_EFFECT(X, C) (LAZYACCESS(X.chem_effects, C) || 0)
4245

4346
//reagent flags

0 commit comments

Comments
 (0)