Skip to content

Commit

Permalink
Merge branch 'master' into translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Legendaxe committed Mar 12, 2024
2 parents 4bf8455 + eb63b0e commit 261aae6
Show file tree
Hide file tree
Showing 277 changed files with 2,562 additions and 1,185 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
pull_request:
branches:
- master
merge_group:

jobs:
run_linters:
Expand Down Expand Up @@ -36,6 +37,7 @@ jobs:
python tools/ci/check_file_names.py
python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
python tools/ci/define_sanity.py
python -m tools.ci.check_icon_conflicts
python -m tools.ci.check_icon_dupenames
python -m tools.maplint.source --github
Expand Down
24 changes: 2 additions & 22 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,14 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "shell",
"command": "paracode/linters/check_grep2",
"windows": {
"command": ".\\tools\\bootstrap\\python.bat .\\tools\\ci\\check_grep2.py ${relativeFile}",
},
"problemMatcher": {
"owner": "dm",
"fileLocation": "relative",
"pattern": {
"regexp": "^(.*):(\\d+):\\s+(.*)$",
"file": 1,
"line": 2,
"message": 3,
}
},
"label": "linters: run check_grep2"
},
{
"type": "dreammaker",
"dme": "paradise.dme",
"problemMatcher": [
"$dreammaker"
],
"group": "build",
"label": "dm: build - paradise.dme",
"dependsOn": [
"linters: run check_grep2",
]
"label": "dm: build - paradise.dme"
},
{
"type": "shell",
Expand Down Expand Up @@ -57,5 +36,6 @@
"group": "build",
"label": "tgui: run dev server"
}
,
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -1510,6 +1510,10 @@
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating/airless,
/area/ruin/unpowered/althland_excavation)
"XS" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/lavaland/surface/outdoors)
"Ya" = (
/obj/structure/railing,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1806,10 +1810,10 @@ aB
aB
aA
TD
TN
XS
Ei
zp
TN
XS
BW
aB
Ei
Expand Down Expand Up @@ -1969,7 +1973,7 @@ aB
aB
aL
or
TN
XS
Ei
Ei
TN
Expand Down Expand Up @@ -1998,7 +2002,7 @@ aB
aB
aB
aB
TN
XS
eC
Ei
Ei
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,10 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"hI" = (
/obj/effect/spawner/random_spawners/wall_rusted_maybe,
/turf/simulated/wall/r_wall,
/area/lavaland/surface/outdoors)
"hP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -971,6 +975,18 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"zv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/reinforced,
/obj/machinery/conveyor/west,
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor{
temperature = 300;
oxygen = 14;
nitrogen = 23
},
/area/ruin/unpowered/althland_processing)
"zE" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/pickaxe,
Expand Down Expand Up @@ -1364,6 +1380,15 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Hs" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/plasteel{
temperature = 300;
oxygen = 14;
nitrogen = 23
},
/area/ruin/unpowered/althland_processing)
"Hx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand All @@ -1376,6 +1401,16 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Hz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/plasteel{
temperature = 300;
oxygen = 14;
nitrogen = 23
},
/area/ruin/unpowered/althland_processing)
"HO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1889,6 +1924,11 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"WU" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"Xn" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/mapping_helpers/no_lava,
Expand Down Expand Up @@ -2395,7 +2435,7 @@ ui
QE
af
BM
no
Hz
bO
In
dM
Expand Down Expand Up @@ -2445,7 +2485,7 @@ bV
bL
ab
af
ui
hI
bT
ab
ab
Expand Down Expand Up @@ -2524,7 +2564,7 @@ bT
bT
bT
ui
hP
zv
UP
Ic
ui
Expand Down Expand Up @@ -2711,7 +2751,7 @@ ui
ab
ab
ab
ab
WU
ab
ab
ab
Expand Down Expand Up @@ -2760,7 +2800,7 @@ KJ
af
bT
bT
ui
hI
ab
bL
"}
Expand Down Expand Up @@ -2830,7 +2870,7 @@ bT
bT
bT
bT
ui
hI
af
bT
ab
Expand All @@ -2841,7 +2881,7 @@ bV
bL
ab
ab
ui
hI
af
bT
bT
Expand Down Expand Up @@ -2882,7 +2922,7 @@ ab
bT
bT
bT
ui
hI
bT
bT
bT
Expand Down Expand Up @@ -2932,12 +2972,12 @@ lZ
ui
Yd
nN
ui
hI
af
AL
af
af
ui
hI
bT
ab
ab
Expand All @@ -2957,7 +2997,7 @@ bT
bT
af
af
ui
hI
af
bT
ui
Expand Down Expand Up @@ -3143,17 +3183,17 @@ YK
hj
Az
BV
hj
Hs
Dz
ui
bT
Wp
ui
hI
af
af
af
af
ui
hI
bT
bT
ab
Expand Down Expand Up @@ -3247,7 +3287,7 @@ bT
bT
bT
bT
ui
hI
bT
bT
bT
Expand Down
7 changes: 7 additions & 0 deletions code/__DEFINES/action_button_defines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#define AB_CHECK_RESTRAINED (1<<0)
#define AB_CHECK_STUNNED (1<<1)
#define AB_CHECK_LYING (1<<2)
#define AB_CHECK_CONSCIOUS (1<<3)
#define AB_CHECK_TURF (1<<4)
#define AB_CHECK_HANDS_BLOCKED (1<<5)
#define AB_CHECK_IMMOBILE (1<<6)
34 changes: 34 additions & 0 deletions code/__DEFINES/contractors.dm → code/__DEFINES/antag_defines.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/**
* Contractors
*/
// Contract Statuses
/// The contract is invalid for some reason and cannot be taken. It may be made valid later.
#define CONTRACT_STATUS_INVALID -1
Expand Down Expand Up @@ -27,3 +30,34 @@

GLOBAL_DATUM(prisoner_belongings, /obj/structure/closet/secure_closet/contractor)
GLOBAL_LIST(contractors)

/**
* Traitors
*/
#define UPLINK_SPECIAL_SPAWNING "ONE PINK CHAINSAW PLEASE"

/**
* Changelings
*/
// Defines below to be used with the changeling action's `power_type` var.
/// Denotes that this power is free and should be given to all changelings by default.
#define CHANGELING_INNATE_POWER 1
/// Denotes that this power can only be obtained by purchasing it.
#define CHANGELING_PURCHASABLE_POWER 2
/// Denotes that this power can not be obtained normally. Primarily used for base types such as [/datum/action/changeling/weapon].
#define CHANGELING_UNOBTAINABLE_POWER 3

#define CHANGELING_FAKEDEATH_TIME 50 SECONDS
#define CHANGELING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob

/**
* Abductors
*/

#define ABDUCTOR_VEST_STEALTH 1
#define ABDUCTOR_VEST_COMBAT 2

/**
* Pulse Demon
*/
#define PULSEDEMON_SOURCE_DRAIN_INVALID (-1)
28 changes: 28 additions & 0 deletions code/__DEFINES/apc_defines.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// main_status var
#define APC_EXTERNAL_POWER_NOTCONNECTED 0
#define APC_EXTERNAL_POWER_NOENERGY 1
#define APC_EXTERNAL_POWER_GOOD 2

//opened
#define APC_CLOSED 0
#define APC_OPENED 1
#define APC_COVER_OFF 2

#define APC_AUTOFLAG_ALL_OFF 0
#define APC_AUTOFLAG_ENVIRO_ONLY 1
#define APC_AUTOFLAG_EQUIPMENT_OFF 2
#define APC_AUTOFLAG_ALL_ON 3

//electronics_state
#define APC_ELECTRONICS_NONE 0
#define APC_ELECTRONICS_INSTALLED 1
#define APC_ELECTRONICS_SECURED 2

/// Power channel is off, anything connected to it is not powered, cannot be set manually by players
#define APC_CHANNEL_SETTING_OFF 0
/// APC power channel Setting Off, if set while apc is "on" set apc to "off" otherwise set to "auto-off"
#define APC_CHANNEL_SETTING_AUTO_OFF 1
/// APC power channel setting on,
#define APC_CHANNEL_SETTING_ON 2 //on
// APC user setting,
#define APC_CHANNEL_SETTING_AUTO_ON 3 //auto
Loading

0 comments on commit 261aae6

Please sign in to comment.