Merge branch 'master220' into СС-arm2

ss220-space · Dec 10, 2023 · f198c11 · f198c11
2 parents b8968df + c3f6dd0
commit f198c11
Show file tree

Hide file tree

Showing 528 changed files with 8,932 additions and 6,501 deletions.
diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -11288,7 +11288,7 @@
 /obj/item/paper/terrorspiders3,
 /obj/item/pen/edagger,
 /obj/item/stack/telecrystal{
-	amount = 10
+	amount = 50
 	},
 /obj/item/chameleon,
 /obj/item/reagent_containers/glass/bottle/traitor,

diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm
@@ -2673,11 +2673,11 @@
 	desc = "Баксоны максона. Возможно кто-то приобретет пропуск.";
 	name = "100.000 �������� �������"
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	amount = 115;
 	desc = null
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	amount = 115;
 	desc = null
 	},
@@ -12047,18 +12047,18 @@
 /area/centcom/zone1)
 "fQg" = (
 /obj/structure/table/wood,
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	pixel_x = 3
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	pixel_x = -3;
 	pixel_y = 4
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	pixel_x = -4;
 	pixel_y = -2
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	pixel_x = 3;
 	pixel_y = 9
 	},

diff --git a/_maps/map_files/generic/syndicatebase.dmm b/_maps/map_files/generic/syndicatebase.dmm
@@ -191,7 +191,7 @@
 /obj/item/stack/sheet/mineral/gold{
 	amount = 50
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	amount = 20;
 	desc = null
 	},

diff --git a/_maps/map_files/generic/z2_old.dmm b/_maps/map_files/generic/z2_old.dmm
@@ -10998,19 +10998,19 @@
 /obj/item/gun/projectile/shotgun/boltaction,
 /obj/item/gun/projectile/shotgun/boltaction,
 /obj/item/gun/projectile/shotgun/boltaction,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
 /obj/item/gun/projectile/shotgun/boltaction,
-/obj/item/ammo_box/speedloader/shotgun/a762,
-/obj/item/ammo_box/speedloader/shotgun/a762,
+/obj/item/ammo_box/speedloader/a762,
+/obj/item/ammo_box/speedloader/a762,
 /obj/machinery/light/small{
 	brightness_range = 10;
 	light_range = 10;
@@ -13202,11 +13202,11 @@
 	desc = "Баксоны максона. Возможно кто-то приобретет пропуск.";
 	name = "100.000 �������� �������"
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	amount = 115;
 	desc = null
 	},
-/obj/item/stack/telecrystal/fifty{
+/obj/item/stack/telecrystal/twohundread_fifty{
 	amount = 115;
 	desc = null
 	},

diff --git a/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm b/code/ATMOSPHERICS/pipes/simple/pipe_simple_he.dm
@@ -58,7 +58,7 @@
 		if(pipe_air.temperature > heat_limit + 1)
 			for(var/m in buckled_mobs)
 				var/mob/living/buckled_mob = m
-				buckled_mob.apply_damage(4 * log(pipe_air.temperature - heat_limit), BURN, "chest")
+				buckled_mob.apply_damage(4 * log(pipe_air.temperature - heat_limit), BURN, BODY_ZONE_CHEST)
 
 
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/New()

diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
@@ -96,7 +96,7 @@
 #define EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER 8	//Coefficient of multiplication for the damage the item does when removed without a surgery (this*item.w_class)
 #define EMBEDDED_UNSAFE_REMOVAL_TIME			30	//A Time in ticks, total removal time = (this*item.w_class)
 
-// Body Parts
+// Body Part Zones
 #define BODY_ZONE_HEAD		"head"
 #define BODY_ZONE_CHEST		"chest"
 #define BODY_ZONE_L_ARM		"l_arm"
@@ -114,6 +114,7 @@
 #define BODY_ZONE_PRECISE_L_FOOT	"l_foot"
 #define BODY_ZONE_PRECISE_R_FOOT	"r_foot"
 
+
 //We will round to this value in damage calculations.
 #define DAMAGE_PRECISION 0.1
 

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -301,6 +301,7 @@
 
 ///from base of mob/key_down(): (_key, client/user)
 #define COMSIG_MOB_KEY_DROP_ITEM_DOWN "mob_key_drop_item_down"
+	#define COMPONENT_CANCEL_DROP (1<<0)
 
 ///from base of obj/allowed(mob/M): (/obj) returns bool, if TRUE the mob has id access to the obj
 #define COMSIG_MOB_ALLOWED "mob_allowed"
@@ -655,9 +656,10 @@
 #define COMSIG_HUMAN_CHANGE_HEAD_ACCESSORY "human_change_head_accessory"
 //from /mob/living/carbon/human/proc/apply_overlay
 #define COMSIG_HUMAN_APPLY_OVERLAY "living_apply_overlay"
+///From mob/living/carbon/human/do_suicide()
+#define COMSIG_HUMAN_SUICIDE_ACT "human_suicide_act"
 
 // /datum/species signals
-
 ///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
 #define COMSIG_SPECIES_GAIN "species_gain"
 ///from datum/species/on_species_loss(): (datum/species/lost_species)

diff --git a/code/__DEFINES/implants_defines.dm b/code/__DEFINES/implants_defines.dm
@@ -0,0 +1,35 @@
+/// If used, an implant will trigger when an emote is intentionally used.
+#define BIOCHIP_EMOTE_TRIGGER_INTENTIONAL (1<<0)
+/// If used, an implant will trigger when an emote is forced/unintentionally used.
+#define BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL (1<<1)
+/// If used, an implant will always trigger when the user makes an emote.
+#define BIOCHIP_EMOTE_TRIGGER_ALWAYS (BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL|BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)
+/// If used, an implant will trigger on the user's first death.
+#define BIOCHIP_TRIGGER_DEATH_ONCE (1<<2)
+/// If used, an implant will trigger any time a user dies.
+#define BIOCHIP_TRIGGER_DEATH_ANY (1<<3)
+/// If used, an implant will NOT trigger on death when a user is gibbed.
+#define BIOCHIP_TRIGGER_NOT_WHEN_GIBBED (1<<4)
+
+// Defines related to the way that the implant is activated. This is the value for implant.activated
+/// The implant is passively active (like a mindshield)
+#define BIOCHIP_ACTIVATED_PASSIVE 0
+/// The implant is activated manually by a trigger
+#define BIOCHIP_ACTIVATED_ACTIVE 1
+
+// Defines related to biochip current status
+/// The implant is currently inside the body
+#define BIOCHIP_IMPLANTED 1
+/// The implant was once implanted into someone
+#define BIOCHIP_USED 0
+/// The implant is new and intact
+#define BIOCHIP_NEW null
+
+// Defines implanting results of proc [/obj/item/implant/proc/implant()]
+/// Implant is successfully installed
+#define BIOCHIP_IMPLANT_SUCCESS 1
+/// Implant fails to inject
+#define BIOCHIP_IMPLANT_FAIL -1
+/// Return this if there's no room for the implant
+#define BIOCHIP_IMPLANT_NOROOM 0
+
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -36,8 +36,6 @@
 
 #define isprojectile(A) (istype(A, /obj/item/projectile))
 
-#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable
-
 #define is_pen(W) (istype(W, /obj/item/pen))
 
 #define is_pda(W) (istype(W, /obj/item/pda))

diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
@@ -89,6 +89,8 @@
 #define HIGH_LANDMARK_LAYER 9.2
 #define AREA_LAYER 10
 #define MASSIVE_OBJ_LAYER 11
+
+#define POINT_PLANE 14
 #define POINT_LAYER 12
 
 #define CHAT_LAYER 12.0001 // Do not insert layers between these two values

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -1,11 +1,12 @@
 ///////////////////ORGAN DEFINES///////////////////
 
 // Organ defines.
-#define ORGAN_BROKEN     1
-#define ORGAN_ROBOT      2
-#define ORGAN_SPLINTED   4
-#define ORGAN_DEAD       8
-#define ORGAN_MUTATED    16
+#define ORGAN_BROKEN 1
+#define ORGAN_ROBOT 2
+#define ORGAN_SPLINTED 4
+#define ORGAN_DEAD 8
+#define ORGAN_MUTATED 16
+#define ORGAN_INT_BLEED 32
 
 #define PROCESS_ACCURACY 10
 
@@ -271,7 +272,8 @@
 
 #define isnewplayer(A)  (istype((A), /mob/new_player))
 
-#define isorgan(A)		(istype((A), /obj/item/organ/external))
+#define isexternalorgan(A)		(istype((A), /obj/item/organ/external))
+
 #define hasorgans(A)	(ishuman(A))
 
 #define is_admin(user)	(check_rights(R_ADMIN, 0, (user)) != 0)

diff --git a/code/__DEFINES/organ_defines.dm b/code/__DEFINES/organ_defines.dm
@@ -0,0 +1,56 @@
+// Internal organs
+
+#define INTERNAL_ORGAN_HEART "heart"
+#define INTERNAL_ORGAN_LUNGS "lungs"
+#define INTERNAL_ORGAN_LIVER "liver"
+#define INTERNAL_ORGAN_KIDNEYS "kidneys"
+#define INTERNAL_ORGAN_APPENDIX "appendix"
+#define INTERNAL_ORGAN_EYES "eyes"
+#define INTERNAL_ORGAN_EARS "ears"
+#define INTERNAL_ORGAN_BRAIN "brain"
+
+#define INTERNAL_ORGAN_RESONANT_CRYSTAL "resonant_crystal"
+#define INTERNAL_ORGAN_STRANGE_CRYSTAL "strange_crystal"
+#define INTERNAL_ORGAN_WAX_GLANDS "wax_glands"
+#define INTERNAL_ORGAN_HEADPOCKET "headpocket"
+#define INTERNAL_ORGAN_LANTERN "lantern"
+#define INTERNAL_ORGAN_RESONATOR "adamantine_resonator"
+
+#define INTERNAL_ORGAN_PLASMAVESSEL "plasmavessel"
+#define INTERNAL_ORGAN_ACIDGLAND "acidgland"
+#define INTERNAL_ORGAN_HIVENODE "hivenode"
+#define INTERNAL_ORGAN_NEUROTOXIN_GLAND "neurotoxin_gland"
+#define INTERNAL_ORGAN_RESIN_SPINNER "resin_spinner"
+#define INTERNAL_ORGAN_EGGSAC "eggsac"
+
+#define INTERNAL_ORGAN_L_ARM_DEVICE "l_arm_device"
+#define INTERNAL_ORGAN_R_ARM_DEVICE "r_arm_device"
+#define INTERNAL_ORGAN_L_LEG_DEVICE "l_leg_device"
+#define INTERNAL_ORGAN_R_LEG_DEVICE "r_leg_device"
+#define INTERNAL_ORGAN_EYE_SIGHT_DEVICE "eye_sight"
+#define INTERNAL_ORGAN_EYE_HUD_DEVICE "eye_hud"
+#define INTERNAL_ORGAN_EYE_SHIELD_DEVICE "eye_shield"
+#define INTERNAL_ORGAN_EYE_LING "eye_ling"
+#define INTERNAL_ORGAN_BREATHING_TUBE "breathing_tube"
+#define INTERNAL_ORGAN_STOMACH "stomach"
+#define INTERNAL_ORGAN_HEART_DRIVE "heartdrive"
+#define INTERNAL_ORGAN_BRAIN_ANTIDROP "brain_antidrop"
+#define INTERNAL_ORGAN_BRAIN_ANTISTUN "brain_antistun"
+#define INTERNAL_ORGAN_BRAIN_ANTISLEEP "brain_antisleep"
+#define INTERNAL_ORGAN_BRAIN_CLOWNVOICE "brain_clownvoice"
+#define INTERNAL_ORGAN_BRAIN_SPEECHTRANSLATOR "brain_speechtranslator"
+
+#define INTERNAL_ORGAN_VOCALCORDS "vocal_cords"
+#define INTERNAL_ORGAN_HIVECORE "hivecore"
+#define INTERNAL_ORGAN_PARASITE_EGG "parasite_egg"
+
+#define INTERNAL_ORGAN_HAIR "hair_organ"	// yeah thats a thing
+#define INTERNAL_ORGAN_HONK_BLADDER "honk_bladder"
+#define INTERNAL_ORGAN_BRAIN_TUMOR "brain_tumor"
+
+
+// insert/remove organ special defines
+#define ORGAN_MANIPULATION_DEFAULT 0
+#define ORGAN_MANIPULATION_NOEFFECT 1
+#define ORGAN_MANIPULATION_ABDUCTOR 2
+
diff --git a/code/__DEFINES/uplink_types.dm b/code/__DEFINES/uplink_types.dm
@@ -2,3 +2,5 @@
 #define UPLINK_TYPE_NUCLEAR 1
 #define UPLINK_TYPE_SST 2
 #define UPLINK_TYPE_ADMIN 3
+#define UPLINK_TYPE_SIT 4
+
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
@@ -118,7 +118,7 @@
 		var/datum/robolimb/R = new limb_type()
 		GLOB.all_robolimbs[R.company] = R
 		if(!R.unavailable_at_chargen)
-			if(R != "head" && R != "chest" && R != "groin" ) //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
+			if(R != BODY_ZONE_HEAD && R != BODY_ZONE_CHEST && R != BODY_ZONE_PRECISE_GROIN ) //Part of the method that ensures only IPCs can access head, chest and groin prosthetics.
 				if(R.has_subtypes) //Ensures solos get added to the list as well be incorporating has_subtypes == 1 and has_subtypes == 2.
 					GLOB.chargen_robolimbs[R.company] = R //List only main brands and solo parts.
 		if(R.selectable)

diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm
@@ -3,7 +3,7 @@
 	Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
 
 
-/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3)
+/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
 	if(!segments)
 		return
 	var/segment = 360/segments
@@ -19,7 +19,10 @@
 
 	speed /= segments
 
-	animate(src, transform = matrices[1], time = speed, loops)
+	if(parallel)
+		animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL)
+	else
+		animate(src, transform = matrices[1], time = speed, loops)
 	for(var/i in 2 to segments) //2 because 1 is covered above
 		animate(transform = matrices[i], time = speed)
 		//doesn't have an object argument because this is "Stacking" with the animate call above

diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm
@@ -19,7 +19,7 @@
 
 /**
  * Replaces the `%(SINGLE,PLURAL)%` or `%(MALE,FEMALE,NEUTER,PLURAL)%` message piece accordingly to user gender.
- * Use `*` to deliberatly skip one genderize word.
+ * Use `*` to deliberatly skip one genderize word: `%(*,FEMALE,*,PLURAL)%`.
  *
  * Arguments:
  * * user - Person which pronouns will be used.

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
@@ -536,6 +536,7 @@
 		text = replacetext(text, "\[logo\]",	"&ZeroWidthSpace;<img src = ntlogo.png>")
 		text = replacetext(text, "\[slogo\]",	"&ZeroWidthSpace;<img src = syndielogo.png>")
 		text = replacetext(text, "\[ussplogo\]", "&ZeroWidthSpace;<img src = ussplogo.png>")
+		text = replacetext(text, "\[solgov\]", "&ZeroWidthSpace;<img src = solgovlogo.png>")
 		text = replacetext(text, "\[time\]",	"[station_time_timestamp()]") // TO DO
 		text = replacetext(text, "\[date\]",	"[GLOB.current_date_string]")
 		text = replacetext(text, "\[station\]", "[station_name()]")