Merge remote-tracking branch 'upstream/master' into apc

cmss13-devs · Oct 26, 2023 · 29031f9 · 29031f9
2 parents 1cc2df6 + 468fb17
commit 29031f9
Show file tree

Hide file tree

Showing 83 changed files with 1,362 additions and 987 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![Build Status](https://github.com/PvE-CMSS13/PvE-CMSS13/workflows/CI%20Suite/badge.svg)](https://github.com/PvE-CMSS13/PvE-CMSS13/actions?query=workflow%3A%22CI+Suite%22)
 * **Code:** https://github.com/PvE-CMSS13/PvE-CMSS13
-* **Discord:** https://discord.gg/v6P6wns5dN
+* **Discord:** https://discord.gg/pve-cmss13
 
 This is the codebase for the PvE CM-SS13 fork of CM-SS13 flavoured fork of SpaceStation 13
 

diff --git a/code/__DEFINES/chemistry.dm b/code/__DEFINES/chemistry.dm
@@ -221,6 +221,7 @@
 #define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic"
 #define PROPERTY_UNKNOWN "unknown" //just has an OD effect
 #define PROPERTY_HEMOSITIC "hemositic"
+#define PROPERTY_REVITALIZING "revitalizing"
 
 
 //Property rarity

diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_human.dm
@@ -67,3 +67,7 @@
 #define COMSIG_HUMAN_SURGERY_APPLY_MODIFIERS "human_surgery_apply_modifiers"
 /// From /mob/living/carbon/human/proc/get_flags_cold_protection()
 #define COMSIG_HUMAN_COLD_PROTECTION_APPLY_MODIFIERS "human_cold_protection_apply_modifiers"
+
+/// From /mob/living/carbon/human/UnarmedAttack()
+#define COMSIG_HUMAN_BEFORE_ATTACK_HAND "human_before_attack_hand"
+	#define COMPONENT_CANCEL_HUMAN_ATTACK_HAND (1<<0)
diff --git a/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm b/code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm
@@ -128,3 +128,7 @@
 
 /// From /obj/item/proc/pickup() : (obj/item/picked_up)
 #define COMSIG_MOB_PICKUP_ITEM "mob_pickup_item"
+
+/// From /mob/proc/say_dead(message)
+#define COMSIG_DEAD_SPEAK "comsig_dead_speak"
+		#define COMPONENT_OVERRIDE_DEAD_SPEAK (1<<0)
diff --git a/code/__DEFINES/dcs/signals/atom/signals_atom.dm b/code/__DEFINES/dcs/signals/atom/signals_atom.dm
@@ -45,3 +45,23 @@
 
 ///When the transform or an atom is varedited through vv topic.
 #define COMSIG_ATOM_VV_MODIFY_TRANSFORM "atom_vv_modify_transform"
+
+/// From /mob/living/carbon/human/UnarmedAttack()
+#define COMSIG_ATOM_BEFORE_HUMAN_ATTACK_HAND "atom_before_human_attack_hand"
+	#define COMPONENT_CANCEL_ATTACK_HAND (1<<0)
+
+/// From /mob/proc/click_adjacent()
+#define COMSIG_ATOM_MOB_ATTACKBY "atom_mob_attackby"
+	#define COMPONENT_CANCEL_ATTACKBY (1<<0)
+
+/// From /atom/proc/attack_hand()
+#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand"
+
+/// From /datum/component/phone/proc/picked_up_call() and /datum/component/phone/proc/post_call_phone()
+#define COMSIG_ATOM_PHONE_PICKED_UP "atom_phone_picked_up"
+/// From /datum/component/phone/proc/recall_handset()
+#define COMSIG_ATOM_PHONE_HUNG_UP "atom_phone_hung_up"
+/// From /datum/component/phone/proc/call_phone()
+#define COMSIG_ATOM_PHONE_RINGING "atom_phone_ringing"
+/// From /datum/component/phone/proc/reset_call()
+#define COMSIG_ATOM_PHONE_STOPPED_RINGING "atom_phone_stopped_ringing"
diff --git a/code/__DEFINES/dcs/signals/atom/signals_movable.dm b/code/__DEFINES/dcs/signals/atom/signals_movable.dm
@@ -4,11 +4,15 @@
 /// From /atom/movable/proc/launch_towards
 #define COMSIG_MOVABLE_PRE_THROW "movable_pre_throw"
 	#define COMPONENT_CANCEL_THROW (1<<0)
+
 ///from base of atom/movable/Moved(): (/atom, dir, forced)
 #define COMSIG_MOVABLE_MOVED "movable_moved"
 /// From /atom/movable/Move(): (atom/NewLoc)
 #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"
 	#define COMPONENT_CANCEL_MOVE (1<<0)
+/// From /atom/movable/proc/forceMove(): (atom/NewLoc)
+#define COMSIG_MOVABLE_FORCEMOVED "movable_forcemove"
+
 /// From /turf/open/gm/river/Entered(): (turf/open/gm/river/river, covered)
 #define COMSIG_MOVABLE_ENTERED_RIVER "movable_entered_river"
 
@@ -29,3 +33,4 @@
 #define COMSIG_MOVABLE_UPDATE_GLIDE_SIZE "movable_glide_size"
 
 #define COMSIG_MOVABLE_TURF_ENTER "movable_turf_enter"
+
diff --git a/code/__DEFINES/dcs/signals/atom/signals_obj.dm b/code/__DEFINES/dcs/signals/atom/signals_obj.dm
@@ -22,9 +22,6 @@
 #define COMSIG_SENTRY_EMPTY_AMMO_ALERT "signal_sentry_empty_ammo"
 #define COMSIG_SENTRY_DESTROYED_ALERT "signal_sentry_destroyed"
 
-/// from /obj/structure/transmitter/update_icon()
-#define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon"
-
 #define COMSIG_TENT_COLLAPSING "tent_collapsing"
 
 /// from /obj/proc/afterbuckle()

diff --git a/code/__DEFINES/dcs/signals/atom/signals_turf.dm b/code/__DEFINES/dcs/signals/atom/signals_turf.dm
@@ -15,7 +15,7 @@
 
 /// From /turf/closed/wall/resin/attackby(): (obj/item/I, mob/M)
 #define COMSIG_WALL_RESIN_ATTACKBY "wall_resin_attackby"
-	#define COMPONENT_CANCEL_ATTACKBY (1<<0)
+	#define COMPONENT_CANCEL_RESIN_ATTACKBY (1<<0)
 
 ///from /turf/closed/wall/proc/place_poster
 #define COMSIG_POSTER_PLACED "poster_placed"
diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
@@ -552,7 +552,11 @@ var/global/list/uniform_categories = list(
 #define PHONE_UPP_SOLDIER "Soldier"
 #define PHONE_IO "IO"
 
-#define PHONE_DND_FORCED 2
-#define PHONE_DND_ON 1
-#define PHONE_DND_OFF 0
-#define PHONE_DND_FORBIDDEN -1
+#define PHONE_DO_NOT_DISTURB_FORCED 2
+#define PHONE_DO_NOT_DISTURB_ON 1
+#define PHONE_DO_NOT_DISTURB_OFF 0
+#define PHONE_DO_NOT_DISTURB_FORBIDDEN -1
+
+#define PHONE_ON_BASE_UNIT_ICON_STATE "[initial(icon_state)]"
+#define PHONE_OFF_BASE_UNIT_ICON_STATE "[initial(icon_state)]_ear"
+#define PHONE_RINGING_ICON_STATE "[initial(icon_state)]_ring"
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -58,7 +58,7 @@
 #define MODE_RANDOM_HIVE (1<<12)// Makes Join-as-Xeno choose a hive to join as burrowed larva at random rather than at user's input..
 #define MODE_THUNDERSTORM (1<<13)// Enables thunderstorm effects on maps that are compatible with it. (Lit exterior tiles, rain effects)
 #define MODE_FACTION_CLASH (1<<14)// Disables scopes, sniper sentries, OBs, shooting corpses, dragging enemy corpses, stripping enemy corpses
-#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving
+#define MODE_NO_XENO_EVOLVE (1<<15) // Stops all xenos from evolving or straining
 
 // Gamemode Toggleable Flags
 #define MODE_NO_SNIPER_SENTRY (1<<0) /// Upgrade kits will no longer allow you to select long-range upgrades

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -149,6 +149,9 @@
 		if(W.attack_speed && !src.contains(A)) //Not being worn or carried in the user's inventory somewhere, including internal storages.
 			next_move += W.attack_speed
 
+		if(SEND_SIGNAL(A, COMSIG_ATOM_MOB_ATTACKBY, W, src) & COMPONENT_CANCEL_ATTACKBY)
+			return
+
 		if(!A.attackby(W, src, mods) && A && !QDELETED(A))
 			// in case the attackby slept
 			if(!W)

diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm
@@ -80,12 +80,16 @@
 		to_chat(src, SPAN_NOTICE("You try to move your [temp.display_name], but cannot!"))
 		return
 
+	if(SEND_SIGNAL(A, COMSIG_ATOM_BEFORE_HUMAN_ATTACK_HAND, src, click_parameters) & COMPONENT_CANCEL_HUMAN_ATTACK_HAND)
+		return
+
 	A.attack_hand(src, click_parameters)
 
 /datum/proc/handle_click(mob/living/carbon/human/user, atom/A, params) //Heres our handle click relay proc thing.
 	return HANDLE_CLICK_PASS_THRU
 
 /atom/proc/attack_hand(mob/user)
+	SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user)
 	return
 
 /mob/living/carbon/human/MouseDrop_T(atom/dropping, mob/user)