Revert "Revert "Юнит тесты, стрельба и стеклянные витрины. (#336)""

This reverts commit 9bfc56d.
Proxima-Project · Sep 19, 2023 · 99a7a31 · 99a7a31
1 parent 9240125
commit 99a7a31
Show file tree

Hide file tree

Showing 1,063 changed files with 4,943 additions and 9,796 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ on:
       - remastered_new_dev_proxima_2022_gold_edition
 env:
   BYOND_MAJOR: "514"
-  BYOND_MINOR: "1578"
+  BYOND_MINOR: "1589"
   SPACEMAN_DMM_VERSION: suite-1.7.2
 
 jobs:
@@ -27,7 +27,6 @@ jobs:
       - name: Install Dreamchecker
         run:  scripts/install-spaceman-dmm.sh dreamchecker
       - name: Run dreamchecker
-        id: runDreamchecker
         run: ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
       - name: Annotate Lints
         if: failure() && steps.runDreamchecker.outcome == 'failure'

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,7 +4,6 @@
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
   "files.trimTrailingWhitespace": true,
-
   "files.associations": {
     "*.{dme,dmf,dmm,dm}": "dm",
   },
@@ -13,34 +12,29 @@
     "editor.detectIndentation": false,
     "editor.insertSpaces": false
   },
-
   "[markdown]": {
     "files.trimTrailingWhitespace": false
   },
-
   "[python]": {
     "editor.detectIndentation": false,
     "editor.insertSpaces": true,
     "editor.tabSize": 4
   },
-
   "[yaml]": {
     "editor.detectIndentation": false,
     "editor.insertSpaces": true,
     "editor.tabSize": 2
   },
-
   "workbench.editorAssociations": {
     "*.dmi": "imagePreview.previewEditor"
   },
-
   "debug.onTaskErrors": "abort",
   "dreammaker.objectTreePane": true,
   "dreammaker.autoUpdate": true,
   "dreammaker.tickOnCreate": true,
-
   "gitlens.advanced.blame.customArguments": [
-    "--ignore-revs-file", ".git-blame-ignore-revs"
-],
-"diffEditor.ignoreTrimWhitespace": false
+    "--ignore-revs-file",
+    ".git-blame-ignore-revs"
+  ],
+  "diffEditor.ignoreTrimWhitespace": false
 }
diff --git a/baystation12.dme b/baystation12.dme
@@ -81,11 +81,11 @@
 #include "code\__defines\temperature.dm"
 #include "code\__defines\topic.dm"
 #include "code\__defines\turfs.dm"
-#include "code\__defines\weapons.dm"
 #include "code\__defines\webhooks.dm"
 #include "code\__defines\xenoarcheaology.dm"
 #include "code\__defines\ZAS.dm"
 #include "code\__defines\zmimic.dm"
+#include "code\__defines\proxima\guns.dm"
 #include "code\_global_vars\edible.dm"
 #include "code\_global_vars\logging.dm"
 #include "code\_global_vars\mapping.dm"
@@ -2047,7 +2047,6 @@
 #include "code\modules\mob\living\living_powers.dm"
 #include "code\modules\mob\living\login.dm"
 #include "code\modules\mob\living\logout.dm"
-#include "code\modules\mob\living\recoil.dm"
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\bot\bot.dm"
 #include "code\modules\mob\living\bot\cleanbot.dm"
@@ -3228,6 +3227,7 @@
 #include "customs\code\foler.dm"
 #include "customs\code\hacso.dm"
 #include "customs\code\helldiver.dm"
+#include "customs\code\kardagan.dm"
 #include "customs\code\krabinator.dm"
 #include "customs\code\lodagn.dm"
 #include "customs\code\mafiosy.dm"
@@ -3239,6 +3239,7 @@
 #include "interface\skin.dmf"
 #include "maps\_maps.dm"
 #include "proxima\code\_helpers\colors.dm"
+#include "proxima\code\_helpers\gauss.dm"
 #include "proxima\code\_helpers\_onclick\hud\_defines_ai.dm"
 #include "proxima\code\_helpers\_onclick\hud\ai_hud.dm"
 #include "proxima\code\_helpers\_onclick\hud\ai_screen_object.dm"
@@ -3294,6 +3295,7 @@
 #include "proxima\code\modules\mob\language\human\lirris.dm"
 #include "proxima\code\modules\nano\nanoexternal.dm"
 #include "proxima\code\modules\paperwork\paper.dm"
+#include "proxima\code\modules\projectiles\gun.dm"
 #include "proxima\code\modules\reagents\tobacco.dm"
 #include "proxima\code\modules\research\designs_spacesuit.dm"
 #include "proxima\code\modules\research\designs_weapons.dm"

diff --git a/code/__defines/__compile_options.dm b/code/__defines/__compile_options.dm
@@ -1,2 +1,2 @@
 #define BACKGROUND_ENABLED 0    // The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
-								// 1 will enable set background. 0 will disable set background.
+								// 1 will enable set background. 0 will disable set background.
diff --git a/code/__defines/_renderer.dm b/code/__defines/_renderer.dm
@@ -127,7 +127,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/renderer)
 * Higher plane values are composited over lower. Here, they are ordered from under to over.
 */
 
- /// Handles byond internal letterboxing. Avoid touching.
+	/// Handles byond internal letterboxing. Avoid touching.
 /atom/movable/renderer/letterbox
 	name = "Letterbox"
 	group = RENDER_GROUP_SCENE

diff --git a/code/__defines/ao.dm b/code/__defines/ao.dm
@@ -6,4 +6,4 @@
 #define AO_UPDATE_REBUILD 2
 
 // If ao_neighbors equals this, no AO shadows are present.
-#define AO_ALL_NEIGHBORS 1910 
+#define AO_ALL_NEIGHBORS 1910
diff --git a/code/__defines/ao_misc.dm b/code/__defines/ao_misc.dm
@@ -1,9 +1,9 @@
 /*
 Define for getting a bitfield of adjacent turfs that meet a condition.
- ORIGIN is the object to step from, VAR is the var to write the bitfield to
- TVAR is the temporary turf variable to use, FUNC is the condition to check.
- FUNC generally should reference TVAR.
- example:
+	ORIGIN is the object to step from, VAR is the var to write the bitfield to
+	TVAR is the temporary turf variable to use, FUNC is the condition to check.
+	FUNC generally should reference TVAR.
+	example:
 	var/turf/T
 	var/result = 0
 	CALCULATE_NEIGHBORS(src, result, T, isopenturf(T))

diff --git a/code/__defines/armor.dm b/code/__defines/armor.dm
@@ -44,4 +44,4 @@
 #define  ARMOR_ENERGY_SMALL			25
 #define  ARMOR_ENERGY_RESISTANT		40
 #define  ARMOR_ENERGY_STRONG		75
-#define  ARMOR_ENERGY_SHIELDED		100
+#define  ARMOR_ENERGY_SHIELDED		100
diff --git a/code/__defines/atmospherics.dm b/code/__defines/atmospherics.dm
@@ -23,4 +23,4 @@
 #define PIPE_CLASS_QUATERNARY       4
 #define PIPE_CLASS_OMNI             5
 
-#define ADIABATIC_EXPONENT          0.667 //Actually adiabatic exponent - 1.
+#define ADIABATIC_EXPONENT          0.667 //Actually adiabatic exponent - 1.
diff --git a/code/__defines/callback.dm b/code/__defines/callback.dm
@@ -1,4 +1,4 @@
 #define GLOBAL_PROC	"some_magic_bullshit"
 
 #define CALLBACK new /datum/callback
-#define INVOKE_ASYNC ImmediateInvokeAsync
+#define INVOKE_ASYNC ImmediateInvokeAsync
diff --git a/code/__defines/directions.dm b/code/__defines/directions.dm
@@ -6,4 +6,4 @@
 #define N_NORTHEAST 32
 #define N_NORTHWEST 512
 #define N_SOUTHEAST 64
-#define N_SOUTHWEST 1024 
+#define N_SOUTHWEST 1024
diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm
@@ -1,3 +1,3 @@
 #define GET_RANDOM_JOB 0
 #define BE_ASSISTANT 1
-#define RETURN_TO_LOBBY 2
+#define RETURN_TO_LOBBY 2
diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm
@@ -74,7 +74,7 @@
 #define STATUS_INTERACTIVE 2 // GREEN Visability
 
 /*
- *	Atmospherics Machinery.
+	*	Atmospherics Machinery.
 */
 #define MAX_SIPHON_FLOWRATE   2500 // L/s. This can be used to balance how fast a room is siphoned. Anything higher than CELL_VOLUME has no effect.
 #define MAX_SCRUBBER_FLOWRATE 200  // L/s. Max flow rate when scrubbing from a turf.

diff --git a/code/__defines/materials.dm b/code/__defines/materials.dm
@@ -134,4 +134,4 @@
 #define  MATERIAL_FLEXIBLE  20
 #define  MATERIAL_RIGID  40
 #define  MATERIAL_HARD  60
-#define  MATERIAL_VERY_HARD  80
+#define  MATERIAL_VERY_HARD  80
diff --git a/code/__defines/overmap.dm b/code/__defines/overmap.dm
@@ -11,4 +11,4 @@
 #define OVERMAP_WEAKNESS_EMP 2
 #define OVERMAP_WEAKNESS_MINING 4
 #define OVERMAP_WEAKNESS_EXPLOSIVE 8
-#define OVERMAP_WEAKNESS_DROPPOD 16
+#define OVERMAP_WEAKNESS_DROPPOD 16
diff --git a/code/__defines/proxima/guns.dm b/code/__defines/proxima/guns.dm
@@ -0,0 +1,7 @@
+#define GUN_BULK_PISTOL       1
+#define GUN_BULK_REVOLVER     2
+#define GUN_BULK_SMG          3
+#define GUN_BULK_CARABINE     4
+//#define GUN_BULK_RIFLE        5 определено в оригинале ~bear1ake
+#define GUN_BULK_SNIPER_RIFLE 6
+#define GUN_BULK_MACHINEGUN   7
diff --git a/code/__defines/psi.dm b/code/__defines/psi.dm
@@ -14,4 +14,4 @@
 #define PSI_RANK_OPERANT       2
 #define PSI_RANK_MASTER        3
 #define PSI_RANK_GRANDMASTER   4
-#define PSI_RANK_PARAMOUNT     5
+#define PSI_RANK_PARAMOUNT     5
diff --git a/code/__defines/research.dm b/code/__defines/research.dm
@@ -16,4 +16,4 @@
 #define MECHFAB       FLAG(2)  //Mechfab
 #define CHASSIS       FLAG(3)  //For protolathe, but differently
 
-#define T_BOARD(name)	"circuit board (" + (name) + ")"
+#define T_BOARD(name)	"circuit board (" + (name) + ")"
diff --git a/code/__defines/ruin_tags.dm b/code/__defines/ruin_tags.dm
@@ -5,4 +5,4 @@
 #define RUIN_ALIEN 		4		//artificial structure of an unknown origin
 #define RUIN_WRECK 		8		//crashed vessel
 #define RUIN_NATURAL	16		//naturally occuring structure
-#define RUIN_WATER 		32		//ruin depending on planet having water accessible
+#define RUIN_WATER 		32		//ruin depending on planet having water accessible
diff --git a/code/__defines/shuttle.dm b/code/__defines/shuttle.dm
@@ -10,4 +10,4 @@
 //Overmap landable shuttles
 #define SHIP_STATUS_LANDED   1
 #define SHIP_STATUS_TRANSIT  2
-#define SHIP_STATUS_OVERMAP  3
+#define SHIP_STATUS_OVERMAP  3
diff --git a/code/__defines/skills.dm b/code/__defines/skills.dm
@@ -33,4 +33,4 @@
 #define SKILL_SCIENCE       /decl/hierarchy/skill/research/science
 #define SKILL_MEDICAL       /decl/hierarchy/skill/medical/medical
 #define SKILL_ANATOMY       /decl/hierarchy/skill/medical/anatomy
-#define SKILL_CHEMISTRY     /decl/hierarchy/skill/medical/chemistry
+#define SKILL_CHEMISTRY     /decl/hierarchy/skill/medical/chemistry
diff --git a/code/__defines/targeting.dm b/code/__defines/targeting.dm
@@ -1,4 +1,4 @@
 #define TARGET_CAN_MOVE 1
 #define TARGET_CAN_RUN 2
 #define TARGET_CAN_CLICK 4
-#define TARGET_CAN_RADIO 8
+#define TARGET_CAN_RADIO 8
diff --git a/code/__defines/weapons.dm b/code/__defines/weapons.dm
diff --git a/code/__defines/xenoarcheaology.dm b/code/__defines/xenoarcheaology.dm
@@ -54,4 +54,4 @@
 #define EFFECT_PARTICLE 4
 #define EFFECT_ORGANIC 5
 #define EFFECT_BLUESPACE 6
-#define EFFECT_SYNTH 7
+#define EFFECT_SYNTH 7
diff --git a/code/__defines/~unit_testing.dm b/code/__defines/~unit_testing.dm
@@ -1,10 +1,10 @@
 /*
- *
- *   This file is used to indicate that Unit Tests are to be ran.
- *   Do not add anything but the UNIT_TEST definition here as it will be overwritten when running tests.
- *
- *
- *   Should you wish to edit set UNIT_TEST to 1 like so:
- *   #define UNIT_TEST 1
- */
+	*
+	*   This file is used to indicate that Unit Tests are to be ran.
+	*   Do not add anything but the UNIT_TEST definition here as it will be overwritten when running tests.
+	*
+	*
+	*   Should you wish to edit set UNIT_TEST to 1 like so:
+	*   #define UNIT_TEST 1
+	*/
 #define UNIT_TEST 0
diff --git a/code/_global_vars/mapping.dm b/code/_global_vars/mapping.dm
@@ -1 +1 @@
-GLOBAL_LIST_EMPTY(ruin_landmarks)
+GLOBAL_LIST_EMPTY(ruin_landmarks)
diff --git a/code/_helpers/atom_movables.dm b/code/_helpers/atom_movables.dm
@@ -60,4 +60,4 @@
 		var/dist = get_dist(a, p)
 		if(dist < closest_distance)
 			closest_distance = dist
-			. = p
+			. = p
diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm
@@ -315,7 +315,7 @@ world
 	Value ranges from 0 to 0xff (255)
 
 		Higher value means brighter color
- */
+	*/
 
 /proc/ReadRGB(rgb)
 	if(!rgb) return
@@ -497,7 +497,7 @@ world
 	amount=0.5 is directly between the two colors
 
 	amount<0 or amount>1 are allowed
- */
+	*/
 /proc/BlendHSV(hsv1, hsv2, amount)
 	var/list/HSV1 = ReadHSV(hsv1)
 	var/list/HSV2 = ReadHSV(hsv2)
@@ -551,7 +551,7 @@ world
 	amount=0.5 is directly between the two colors
 
 	amount<0 or amount>1 are allowed
- */
+	*/
 /proc/BlendRGB(rgb1, rgb2, amount)
 	var/list/RGB1 = ReadRGB(rgb1)
 	var/list/RGB2 = ReadRGB(rgb2)