Merge branch 'ChaoticOnyx:dev' into dev

baystation12.dme

@@ -172,6 +172,7 @@
 #include "code\_onclick\drag_drop.dm"
 #include "code\_onclick\ghost.dm"
 #include "code\_onclick\item_attack.dm"
+#include "code\_onclick\mouse_drag.dm"
 #include "code\_onclick\other_mobs.dm"
 #include "code\_onclick\rig.dm"
 #include "code\_onclick\telekinesis.dm"
@@ -257,8 +258,10 @@
 #include "code\controllers\subsystems\processing\elements.dm"
 #include "code\controllers\subsystems\processing\icon_updates.dm"
 #include "code\controllers\subsystems\processing\mobs.dm"
+#include "code\controllers\subsystems\processing\movable_physics.dm"
 #include "code\controllers\subsystems\processing\nano.dm"
 #include "code\controllers\subsystems\processing\processing.dm"
+#include "code\controllers\subsystems\processing\projectiles.dm"
 #include "code\controllers\subsystems\processing\think.dm"
 #include "code\controllers\subsystems\processing\vines.dm"
 #include "code\datums\ai_law_sets.dm"
@@ -271,6 +274,7 @@
 #include "code\datums\datum.dm"
 #include "code\datums\hierarchy.dm"
 #include "code\datums\mind.dm"
+#include "code\datums\position_point_vector.dm"
 #include "code\datums\progressbar.dm"
 #include "code\datums\recipe.dm"
 #include "code\datums\robot_hulls.dm"
@@ -301,6 +305,7 @@
 #include "code\datums\components\cardborg.dm"
 #include "code\datums\components\label.dm"
 #include "code\datums\components\mind_linker.dm"
+#include "code\datums\components\movable_physics.dm"
 #include "code\datums\components\polar_weather.dm"
 #include "code\datums\components\train_auto.dm"
 #include "code\datums\configuration\__defines.dm"
@@ -1018,6 +1023,10 @@
 #include "code\game\objects\effects\landmarks\events.dm"
 #include "code\game\objects\effects\landmarks\jobs.dm"
 #include "code\game\objects\effects\landmarks\roundstart.dm"
+#include "code\game\objects\effects\projectile\projectile_effects.dm"
+#include "code\game\objects\effects\projectile\projectile_impact.dm"
+#include "code\game\objects\effects\projectile\projectile_muzzle.dm"
+#include "code\game\objects\effects\projectile\projectile_tracer.dm"
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
 #include "code\game\objects\items\apc_frame.dm"
@@ -2508,7 +2517,6 @@
 #include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
 #include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
 #include "code\modules\projectiles\ammunition.dm"
-#include "code\modules\projectiles\effects.dm"
 #include "code\modules\projectiles\gun.dm"
 #include "code\modules\projectiles\projectile.dm"
 #include "code\modules\projectiles\ammunition\boxes.dm"

code/__defines/donations_defines.dm

@@ -9,6 +9,7 @@
 #define PATREON_CULTIST   "cultist"
 #define PATREON_ASSISTANT "assistant"
 
+// IMPORTANT (!!!) KEEP THE ASCENDING ORDER (more benefits -> place it on the right) OTHERWISE IT BREAKS CUSTOM ITEMS ASSIGNATION
 #define PATREON_ALL_TIERS list(\
 	PATREON_NONE, PATREON_CARGO, PATREON_ENGINEER, \
 	PATREON_SCIENTIST, PATREON_HOS, PATREON_CAPTAIN, \

code/__defines/flags.dm

@@ -42,3 +42,5 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define PASS_FLAG_TABLE  0x1
 #define PASS_FLAG_GLASS  0x2
 #define PASS_FLAG_GRILLE 0x4
+#define PASS_FLAG_MOB    0x8
+

code/__defines/sound.dm

@@ -61,8 +61,10 @@
 #define SFX_FAR_FIRE                "far_fire"
 #define SFX_SILENT_FIRE             "silent_fire"
 #define SFX_MAGAZINE_INSERT         "magazine_insert"
-#define SFX_SHELL_INSERT            "shell_insert"
-#define SFX_BULLET_INSERT           "bullet_insert"
+#define SFX_BULLET_INSERT "bullet_insert"
+#define SFX_SHELL_INSERT "shell_insert"
+#define SFX_SPAS12_SHELL_INSERT "spas12_shell_insert"
+#define SFX_REM870_SHELL_INSERT "rem870_shell_insert"
 #define SFX_SHOTGUN_PUMP_IN         "shotgun_pump_in"
 #define SFX_SHOTGUN_PUMP_OUT        "shotgun_pump_out"
 #define SFX_CASING_DROP             "casing_drop"
@@ -76,6 +78,10 @@
 #define SFX_FEMALE_LONG_SCREAM      "female_long_scream"
 #define SFX_FEMALE_FALL_ALIVE       "female_fall_alive"
 #define SFX_FEMALE_FALL_DEAD        "female_fall_dead"
+#define SFX_FEMALE_CRY              "female_cry"
+#define SFX_FEMALE_LAUGH            "female_laugh"
+#define SFX_FEMALE_YAWN             "female_yawn"
+#define SFX_FEMALE_SIGH             "female_sigh"
 
 // MALE EMOTES
 #define SFX_MALE_INTERNAL_BREATH    "male_internal_breath"
@@ -86,6 +92,10 @@
 #define SFX_MALE_LONG_SCREAM        "male_long_scream"
 #define SFX_MALE_FALL_ALIVE         "male_fall_alive"
 #define SFX_MALE_FALL_DEAD          "male_fall_dead"
+#define SFX_MALE_CRY                "male_cry"
+#define SFX_MALE_LAUGH              "male_laugh"
+#define SFX_MALE_YAWN               "male_yawn"
+#define SFX_MALE_SIGH               "male_sigh"
 
 // AMBIENT
 #define SFX_AMBIENT_POWERED_GLOBAL      "ambient_powered_global"
@@ -129,6 +139,7 @@
 #define SFX_USE_BUTTON              "use_button"
 #define SFX_USE_LIGHTER             "use_lighter"
 #define SFX_USE_CHISEL              "use_chisel"
+#define SFX_KEYBOARD                "use_keyboard"
 
 // PULLING
 #define SFX_PULL_BODY               "pull_body"
@@ -195,6 +206,9 @@
 #define SFX_GIB                     "gib"
 #define SFX_CLOWN                   "clown"
 #define SFX_HISS                    "hiss"
+#define SFX_WHISTLE                 "whistle"
+#define SFX_SNORE                   "snore"
+#define SFX_CLAP                    "clap"
 #define SFX_CHOP                    "chop"
 #define SFX_TRR                     "trr"
 #define SFX_RADIO                   "radio"

code/__defines/subsystem-priority.dm

@@ -14,6 +14,7 @@
 #define SS_PRIORITY_TICKER         100   // Gameticker.
 #define SS_PRIORITY_MOB            95    // Mob Life().
 #define SS_PRIORITY_MACHINERY      95    // Machinery + powernet ticks.
+#define SS_PRIORITY_PHYSICS  	   94
 #define SS_PRIORITY_AIR            80    // ZAS processing.
 #define SS_PRIORITY_ALARM          20    // Alarm processing.
 #define SS_PRIORITY_EVENT          20    // Event processing and queue handling.
@@ -29,6 +30,7 @@
 #define SS_PRIORITY_INACTIVITY     10    // Idle kicking.
 #define SS_PRIORITY_SUPPLY         10    // Supply point accumulation.
 #define SS_PRIORITY_TRADE          10    // Adds/removes traders.
+#define SS_PRIORITY_PROJECTILES    10    // Projectile processing.
 
 // SS_BACKGROUND
 #define SS_PRIORITY_OBJECTS       60    // processing_objects processing.

code/_global_vars/sfx.dm

@@ -21,21 +21,32 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/effects/weapons/gun/magazine_insert3.ogg'
 	),
 	SFX_SHELL_INSERT = list(
-		'sound/effects/weapons/gun/shell_insert1.ogg',
-		'sound/effects/weapons/gun/shell_insert2.ogg'
+		'sound/effects/weapons/gun/interaction/shell_insert1.ogg',
+		'sound/effects/weapons/gun/interaction/shell_insert2.ogg'
 	),
 	SFX_BULLET_INSERT = list(
-		'sound/effects/weapons/gun/bullet_insert1.ogg',
-		'sound/effects/weapons/gun/bullet_insert2.ogg',
-		'sound/effects/weapons/gun/bullet_insert3.ogg',
-		'sound/effects/weapons/gun/bullet_insert4.ogg',
-		'sound/effects/weapons/gun/bullet_insert5.ogg',
-		'sound/effects/weapons/gun/bullet_insert6.ogg',
-		'sound/effects/weapons/gun/bullet_insert7.ogg',
-		'sound/effects/weapons/gun/bullet_insert8.ogg',
-		'sound/effects/weapons/gun/bullet_insert9.ogg',
-		'sound/effects/weapons/gun/bullet_insert10.ogg',
-		'sound/effects/weapons/gun/bullet_insert11.ogg'
+		'sound/effects/weapons/gun/interaction/bullet_insert1.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert2.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert3.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert4.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert5.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert6.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert7.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert8.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert9.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert10.ogg',
+		'sound/effects/weapons/gun/interaction/bullet_insert11.ogg'
+	),
+	SFX_REM870_SHELL_INSERT = list(
+		'sound/effects/weapons/gun/shotguns/mp133_insert1.ogg',
+		'sound/effects/weapons/gun/shotguns/mp133_insert2.ogg',
+		'sound/effects/weapons/gun/shotguns/mp133_insert3.ogg'
+	),
+	SFX_SPAS12_SHELL_INSERT = list(
+		'sound/effects/weapons/gun/shotguns/spas12_insert1.ogg',
+		'sound/effects/weapons/gun/shotguns/spas12_insert2.ogg',
+		'sound/effects/weapons/gun/shotguns/spas12_insert3.ogg',
+		'sound/effects/weapons/gun/shotguns/spas12_insert4.ogg'
 	),
 	SFX_SHOTGUN_PUMP_IN = list(
 		'sound/effects/weapons/gun/shotgun_pump_in1.ogg',
@@ -150,6 +161,21 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/effects/damage/falling/f_fall_dead10.ogg',
 		'sound/effects/damage/falling/f_fall_dead11.ogg'
 	),
+	SFX_FEMALE_CRY = list(
+		'sound/effects/emotes/f_cry1.ogg',
+		'sound/effects/emotes/f_cry2.ogg',
+		'sound/effects/emotes/f_cry3.ogg',
+		'sound/effects/emotes/f_cry4.ogg'
+	),
+	SFX_FEMALE_LAUGH = list(
+		'sound/effects/emotes/f_laugh.ogg'
+	),
+	SFX_FEMALE_YAWN = list(
+		'sound/effects/emotes/f_yawn.ogg'
+	),
+	SFX_FEMALE_SIGH = list(
+		'sound/effects/emotes/f_sigh.ogg'
+	),
 	// MALE EMOTES
 	SFX_MALE_INTERNAL_BREATH = list(
 		'sound/effects/emotes/m_internal1.ogg',
@@ -260,6 +286,22 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/effects/damage/falling/m_fall_dead10.ogg',
 		'sound/effects/damage/falling/m_fall_dead11.ogg'
 	),
+	SFX_MALE_CRY = list(
+		'sound/effects/emotes/m_cry1.ogg',
+		'sound/effects/emotes/m_cry2.ogg',
+		'sound/effects/emotes/m_cry3.ogg',
+		'sound/effects/emotes/m_cry4.ogg'
+	),
+	SFX_MALE_LAUGH = list(
+		'sound/effects/emotes/m_laugh1.ogg',
+		'sound/effects/emotes/m_laugh2.ogg'
+	),
+	SFX_MALE_YAWN = list(
+		'sound/effects/emotes/m_yawn.ogg'
+	),
+	SFX_MALE_SIGH = list(
+		'sound/effects/emotes/m_sigh.ogg'
+	),
 	// AMBIENT
 	SFX_AMBIENT_POWERED_GLOBAL = list(
 		'sound/ambient/global/amb2.ogg',
@@ -1207,8 +1249,8 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/effects/vent/vent19.ogg'
 	),
 	SFX_CHAINSAW = list(
-		'sound/weapons/chainsaw_attack1.ogg', 
-		'sound/weapons/chainsaw_attack2.ogg', 
+		'sound/weapons/chainsaw_attack1.ogg',
+		'sound/weapons/chainsaw_attack2.ogg',
 		'sound/weapons/chainsaw_attack3.ogg'
 	),
 	SFX_GLASS_HIT = list(
@@ -1244,6 +1286,23 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/voice/hiss3.ogg',
 		'sound/voice/hiss4.ogg'
 	),
+	SFX_WHISTLE = list(
+		'sound/effects/emotes/whistle1.ogg',
+		'sound/effects/emotes/whistle2.ogg',
+		'sound/effects/emotes/whistle3.ogg',
+		'sound/effects/emotes/whistle4.ogg'
+	),
+	SFX_SNORE = list(
+		'sound/effects/emotes/snore1.ogg',
+		'sound/effects/emotes/snore2.ogg',
+		'sound/effects/emotes/snore3.ogg'
+	),
+	SFX_CLAP = list(
+		'sound/effects/emotes/clap1.ogg',
+		'sound/effects/emotes/clap2.ogg',
+		'sound/effects/emotes/clap3.ogg',
+		'sound/effects/emotes/clap4.ogg'
+	),
 	SFX_CHOP = list(
 		'sound/effects/fighting/chop1.ogg',
 		'sound/effects/fighting/chop2.ogg',
@@ -1391,5 +1450,15 @@ GLOBAL_LIST_INIT(sfx_list, list(
 		'sound/effects/robot_footstep/spider01.ogg',
 		'sound/effects/robot_footstep/spider02.ogg',
 		'sound/effects/robot_footstep/spider03.ogg'
+	),
+	SFX_KEYBOARD = list(
+		'sound/machines/keyboard/keystroke1.ogg',
+		'sound/machines/keyboard/keystroke2.ogg',
+		'sound/machines/keyboard/keystroke3.ogg',
+		'sound/machines/keyboard/keystroke4.ogg',
+		'sound/machines/keyboard/keypress1.ogg',
+		'sound/machines/keyboard/keypress2.ogg',
+		'sound/machines/keyboard/keypress3.ogg',
+		'sound/machines/keyboard/keypress4.ogg'
 	)
 ))

code/_helpers/maths.dm

@@ -10,6 +10,9 @@
 /// NaN isn't a number, damn it. Infinity is a problem too.
 #define isnum_safe(x) ( isnum((x)) && !isnan((x)) && !isinf((x)) )
 
+#define MODULUS_FLOAT(X, Y) ( (X) - (Y) * round((X) / (Y)) )
+
+#define SIMPLIFY_DEGREES(degrees) (MODULUS_FLOAT((degrees), 360))
 // min is inclusive, max is exclusive
 /proc/Wrap(val, min, max)
 	var/d = max - min

code/_helpers/type2type.dm

@@ -112,25 +112,25 @@
 /proc/angle2dir(degree)
 	degree = (degree + 22.5) % 360 // 22.5 = 45 / 2
 	if (degree < 45)  return NORTH
-	if (degree < 90)  return NORTHEAST
-	if (degree < 135) return EAST
-	if (degree < 180) return SOUTHEAST
+	if (degree < 90)  return NORTHWEST
+	if (degree < 135) return WEST
+	if (degree < 180) return SOUTHWEST
 	if (degree < 225) return SOUTH
-	if (degree < 270) return SOUTHWEST
-	if (degree < 315) return WEST
-	return NORTH|WEST
+	if (degree < 270) return SOUTHEAST
+	if (degree < 315) return EAST
+	return NORTH|EAST
 
-// Returns the north-zero clockwise angle in degrees, given a direction
+// Returns the north-zero counter-clockwise angle in degrees, given a direction
 /proc/dir2angle(D)
 	switch (D)
 		if (NORTH)     return 0
 		if (SOUTH)     return 180
-		if (EAST)      return 90
-		if (WEST)      return 270
-		if (NORTHEAST) return 45
-		if (SOUTHEAST) return 135
-		if (NORTHWEST) return 315
-		if (SOUTHWEST) return 225
+		if (WEST)      return 90
+		if (EAST)      return 270
+		if (NORTHWEST) return 45
+		if (SOUTHWEST) return 135
+		if (NORTHEAST) return 315
+		if (SOUTHEAST) return 225
 
 // Returns the angle in english
 /proc/angle2text(degree)

code/_helpers/unsorted.dm

@@ -56,6 +56,22 @@
 	return 1
 
 
+/proc/get_projectile_angle(atom/source, atom/target)
+	var/sx = source.x * world.icon_size
+	var/sy = source.y * world.icon_size
+	var/tx = target.x * world.icon_size
+	var/ty = target.y * world.icon_size
+	var/atom/movable/AM
+	if(ismovable(source))
+		AM = source
+		sx += AM.step_x
+		sy += AM.step_y
+	if(ismovable(target))
+		AM = target
+		tx += AM.step_x
+		ty += AM.step_y
+	return SIMPLIFY_DEGREES(arctan(ty - sy, tx - sx))
+
 /proc/Get_Angle(atom/movable/start,atom/movable/end)//For beams.
 	if(!start || !end) return 0
 	var/dy

code/_onclick/click.dm

@@ -242,6 +242,9 @@
 	Only used for swapping hands
 */
 /mob/proc/MiddleClickOn(atom/A)
+	if(A.MiddleClick(src))
+		return
+
 	if(get_preference_value(/datum/client_preference/pointing) == GLOB.PREF_MIDDLE_CLICK)
 		if(pointed(A))
 			return
@@ -253,12 +256,8 @@
 		if(pointed(A))
 			return
 
-
-// In case of use break glass
-/*
-/atom/proc/MiddleClick(mob/M as mob)
+/atom/proc/MiddleClick(mob/M)
 	return
-*/
 
 /*
 	Shift click