Damage flag and file cleanup. (#23)

* FIRE * BURN * MELEE * other stuff * eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee * ehh * Update abilities_gorger.dm * ueh * Update cm_armored.dm Signed-off-by: Helg2 <[email protected]> --------- Signed-off-by: Helg2 <[email protected]>
PMC-Unga-Marines · Jul 19, 2024 · 26e9a0a · 26e9a0a
1 parent 7c9a82b
commit 26e9a0a
Show file tree

Hide file tree

Showing 85 changed files with 500 additions and 1,612 deletions.
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -41,7 +41,6 @@
 #define COMSIG_GLOB_AI_MINION_RALLY "!ai_minion_rally"
 #define COMSIG_GLOB_HIVE_TARGET_DRAINED "!hive_target_drained"
 
-
 /// Sent when a marine dropship enters transit level
 #define COMSIG_GLOB_DROPSHIP_TRANSIT "!dropship_transit"
 ///Sent when xenos launch a hijacked dropship
@@ -156,15 +155,13 @@
 /// Called when the player replies. From /client/proc/cmd_admin_pm().
 #define COMSIG_ADMIN_HELP_REPLIED "admin_help_replied"
 
-
 // /area signals
 #define COMSIG_AREA_ENTERED "area_entered" 						//from base of area/Entered(): (atom/movable/M)
 #define COMSIG_AREA_EXITED "area_exited" 							//from base of area/Exited(): (atom/movable/M)
 
 #define COMSIG_ENTER_AREA "enter_area" 						//from base of area/Entered(): (/area)
 #define COMSIG_EXIT_AREA "exit_area" 							//from base of area/Exited(): (/area)
 
-
 #define COMSIG_CLICK "atom_click"								//from base of atom/Click(): (location, control, params, mob/user)
 #define COMSIG_CLICK_SHIFT "shift_click"						//from base of atom/ShiftClick(): (/mob)
 #define COMSIG_CLICK_CTRL "ctrl_click"							//from base of atom/CtrlClickOn(): (/mob)
@@ -183,7 +180,6 @@
 #define COMSIG_DBLCLICK_ALT "dblclick_alt"
 #define COMSIG_DBLCLICK_CTRL "dblclick_ctrl"
 
-
 // /client signals
 #define COMSIG_CLIENT_MOUSEDOWN "client_mousedown"			//from base of client/MouseDown(): (/client, object, location, control, params)
 #define COMSIG_CLIENT_MOUSEUP "client_mouseup"				//from base of client/MouseUp(): (/client, object, location, control, params)
@@ -261,7 +257,6 @@
 ///Called right before the atom changes the value of light_flags to a different one, from base atom/set_light_flags(): (new_value)
 #define COMSIG_ATOM_SET_LIGHT_FLAGS "atom_set_light_flags"
 
-
 // /atom/movable signals
 #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"				//from base of atom/movable/Move(): (/atom, new_loc, direction)
 	#define COMPONENT_MOVABLE_BLOCK_PRE_MOVE (1<<0)
@@ -404,7 +399,6 @@
 #define COMSIG_HELMET_MODULE_ATTACHING "helmet_module_attaching"
 #define COMSIG_HELMET_MODULE_DETACHED "helmet_module_detached"
 
-
 // /obj/item/weapon/gun signals
 #define COMSIG_GUN_FIRE "gun_fire"
 #define COMSIG_MOB_GUN_FIRE "mob_gun_fire"
@@ -623,7 +617,7 @@
 ///from /mob/living/proc/attack_alien_harm(mob/living/carbon/xenomorph/X, dam_bonus, set_location, random_location, no_head, no_crit, force_intent)
 #define COMSIG_XENOMORPH_ATTACK_LIVING "xenomorph_attack_living"
 	#define COMSIG_XENOMORPH_BONUS_APPLIED (1<<0)
-///from /mob/living/carbon/xenomorph/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+///from /mob/living/carbon/xenomorph/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
 ///only on INTENT_HARM, INTENT_DISARM, IF it does damaage
 #define COMSIG_XENOMORPH_ATTACK_HOSTILE_XENOMORPH "xenomorph_attack_xenomorph"
 
@@ -898,36 +892,12 @@
 
 #define COMSIG_XENOABILITY_SCATTER_SPIT "xenoability_scatter_spit"
 
-/* RUTGMC DELETION, WIDOW DELETION
-#define COMSIG_XENOABILITY_WEB_SPIT "xenoability_web_spit"
-#define COMSIG_XENOABILITY_BURROW "xenoability_burrow"
-#define COMSIG_XENOABILITY_LEASH_BALL "xenoability_leash_ball"
-#define COMSIG_XENOABILITY_CREATE_SPIDERLING "xenoability_create_spiderling"
-#define COMSIG_XENOABILITY_CREATE_SPIDERLING_USING_CC "xenoability_create_spiderling_using_cc"
-#define COMSIG_XENOABILITY_ATTACH_SPIDERLINGS "xenoability_attach_spiderlings"
-#define COMSIG_XENOABILITY_CANNIBALISE_SPIDERLING "xenoability_cannibalise_spiderling"
-#define COMSIG_XENOABILITY_WEB_HOOK "xenoability_web_hook"
-#define COMSIG_XENOABILITY_SPIDERLING_MARK "xenoability_spiderling_mark"
-*/
-
 #define COMSIG_XENOABILITY_PSYCHIC_SHIELD "xenoability_psychic_shield"
 #define COMSIG_XENOABILITY_TRIGGER_PSYCHIC_SHIELD "xenoability_trigger_psychic_shield"
 #define COMSIG_XENOABILITY_PSYCHIC_BLAST "xenoability_psychic_blast"
 #define COMSIG_XENOABILITY_TOGGLE_WARLOCK_ZOOM "xenoability_toggle_warlock_zoom"
 #define COMSIG_XENOABILITY_PSYCHIC_CRUSH "xenoability_psychic_crush"
-/* RU TGMC EDIT
-#define COMSIG_XENOABILITY_TENDRILS "xenoability_tendrils"
-#define COMSIG_XENOABILITY_ORGANICBOMB "xenoability_puppeteerorganicbomb"
-#define COMSIG_XENOABILITY_PUPPET "xenoability_puppet"
-#define COMSIG_XENOABILITY_REFURBISHHUSK "xenoability_refurbishhusk"
-#define COMSIG_XENOABILITY_DREADFULPRESENCE "xenoability_dreadfulpresence"
-#define COMSIG_XENOABILITY_PINCUSHION "xenoability_pincushion"
-#define COMSIG_XENOABILITY_FLAY "xenoability_flay"
-#define COMSIG_XENOABILITY_SENDORDERS_RADIAL "xenoability_sendorders_radial"
-#define COMSIG_XENOABILITY_ATTACKORDER "xenoability_attackorder"
-#define COMSIG_XENOABILITY_RECALLORDER "xenoability_recallorder"
-#define COMSIG_XENOABILITY_BESTOWBLESSINGS "xenoability_giveblessings"
-RU TGMC EDIT */
+
 #define COMSIG_XENOABILITY_BANELING_EXPLODE "xenoability_baneling_explode"
 
 #define COMSIG_XENOABILITY_BEHEMOTH_ROLL "xenoability_behemoth_roll"
@@ -974,7 +944,6 @@ RU TGMC EDIT */
 #define COMSIG_KB_DEFENDORDER "keybind_defendorder"
 #define COMSIG_KB_RETREATORDER "keybind_retreatorder"
 
-
 // human modules signals for keybindings
 #define COMSIG_KB_VALI_CONFIGURE "keybinding_vali_configure"
 #define COMSIG_KB_VALI_HEAL "keybinding_vali_heal"
@@ -1014,7 +983,6 @@ RU TGMC EDIT */
 
 /*******Non-Signal Component Related Defines*******/
 
-
 // /datum/action signals
 #define COMSIG_ACTION_TRIGGER "action_trigger"                        //from base of datum/action/proc/Trigger(): (datum/action)
 	#define COMPONENT_ACTION_BLOCK_TRIGGER (1<<0)
@@ -1053,19 +1021,6 @@ RU TGMC EDIT */
 ///Called from base of /datum/controller/subsystem/spatial_grid/proc/exit_cell: (/atom/movable)
 #define SPATIAL_GRID_CELL_EXITED(contents_type) "spatial_grid_cell_exited_[contents_type]"
 
-/* RUTGMC DELETION, WIDOW DELETION
-// widow spiderling signals
-#define COMSIG_SPIDERLING_MARK "spiderling_mark"
-#define COMSIG_SPIDERLING_RETURN "spiderling_return"
-#define COMSIG_SPIDERLING_GUARD "spiderling_guard"
-#define COMSIG_SPIDERLING_UNGUARD "spiderling_unguard"
-*/
-/* RU TGMC EDIT
-//puppet
-#define COMSIG_PUPPET_CHANGE_ORDER "puppetchangeorder"
-#define COMSIG_PUPPET_CHANGE_ALL_ORDER "puppetglobalorder"
-RU TGMC EDIT */
-
 /// Xeno signals
 #define COMSIG_XENOABILITY_TEARING_TAIL "xenoability_tearing_tail"
 #define COMSIG_XENOABILITY_PANTHER_POUNCE "xenoability_panther_pounce"

diff --git a/code/_onclick/xeno.dm b/code/_onclick/xeno.dm
@@ -14,11 +14,9 @@
 	GLOB.round_statistics.xeno_unarmed_attacks++
 	SSblackbox.record_feedback("tally", "round_statistics", 1, "xeno_unarmed_attacks")
 
-
-/atom/proc/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
+/atom/proc/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
 	return
 
-
 /mob/living/carbon/xenomorph/larva/UnarmedAttack(atom/A, has_proximity, modifiers)
 	if(lying_angle)
 		return FALSE
@@ -30,8 +28,6 @@
 /atom/proc/attack_larva(mob/living/carbon/xenomorph/larva/L)
 	return
 
-
-
 /mob/living/carbon/xenomorph/hivemind/UnarmedAttack(atom/A, has_proximity, modifiers)
 	if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
 		return
@@ -40,8 +36,6 @@
 /atom/proc/attack_hivemind(mob/living/carbon/xenomorph/hivemind/attacker)
 	return
 
-
-
 /mob/living/carbon/xenomorph/facehugger/UnarmedAttack(atom/A, has_proximity, modifiers)
 	if(lying_angle)
 		return FALSE
@@ -58,5 +52,5 @@
 	GLOB.round_statistics.xeno_unarmed_attacks++
 	SSblackbox.record_feedback("tally", "round_statistics", 1, "xeno_unarmed_attacks")
 
-/atom/proc/attack_facehugger(mob/living/carbon/xenomorph/facehugger/F, damage_amount = F.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
+/atom/proc/attack_facehugger(mob/living/carbon/xenomorph/facehugger/F, damage_amount = F.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
 	return
diff --git a/code/datums/gamemodes/campaign/missions/base_rescue.dm b/code/datums/gamemodes/campaign/missions/base_rescue.dm
@@ -103,7 +103,6 @@
 	map_text_broadcast(attacking_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown)
 	map_text_broadcast(defending_faction, message_to_play, "[color] override broadcast", /atom/movable/screen/text/screen_text/picture/potrait/unknown)
 
-
 /obj/effect/landmark/campaign_structure/weapon_x
 	name = "weapon X spawner"
 	icon = 'icons/obj/structures/campaign/tall_structures.dmi'
@@ -145,8 +144,8 @@
 	else
 		icon_state = "[initial(icon_state)]_open"
 
-/obj/structure/weapon_x_pod/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
-	if(X != occupant)
+/obj/structure/weapon_x_pod/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
+	if(xeno_attacker != occupant)
 		return
 	release_occupant()
 

diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
@@ -7,22 +7,17 @@
 	density = TRUE
 	anchored = FALSE
 
-
 /obj/effect/beam
 	name = "beam"
 	var/def_zone
 	allow_pass_flags = PASS_LOW_STRUCTURE
 
-
 /obj/effect/begin
 	name = "begin"
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "begin"
 	anchored = TRUE
 
-
-
-
 /obj/effect/list_container
 	name = "list container"
 
@@ -90,19 +85,15 @@
 	GLOB.fog_blockers -= src
 	return ..()
 
-
 /obj/effect/forcefield/fog/attack_hand(mob/living/user)
 	to_chat(user, span_notice("You peer through the fog, but it's impossible to tell what's on the other side..."))
 	return TRUE
 
+/obj/effect/forcefield/fog/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = MELEE, effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
+	return attack_hand(xeno_attacker)
 
-/obj/effect/forcefield/fog/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE)
-	return attack_hand(X)
-
-
-/obj/effect/forcefield/fog/attack_animal(M)
-	return attack_hand(M)
-
+/obj/effect/forcefield/fog/attack_animal(animal_attacker)
+	return attack_hand(animal_attacker)
 
 /obj/effect/forcefield/fog/CanAllowThrough(atom/movable/mover, turf/target)
 	. = ..()
@@ -171,7 +162,6 @@
 	icon_state = "supplypod_selector"
 	layer = FLY_LAYER
 
-
 /obj/effect/dummy/lighting_obj
 	name = "lighting fx obj"
 	desc = "Tell a coder if you're seeing this."
@@ -193,17 +183,14 @@
 	if(_duration)
 		QDEL_IN(src, _duration)
 
-
 /obj/effect/dummy/lighting_obj/moblight
 	name = "mob lighting fx"
 
-
 /obj/effect/dummy/lighting_obj/moblight/Initialize(mapload, _color, _range, _power, _duration)
 	. = ..()
 	if(!ismob(loc))
 		return INITIALIZE_HINT_QDEL
 
-
 //Makes a tile fully lit no matter what
 /obj/effect/fullbright
 	icon = 'icons/effects/alphacolors.dmi'

diff --git a/code/game/objects/effects/spawners/random/misc_item.dm b/code/game/objects/effects/spawners/random/misc_item.dm
@@ -146,8 +146,7 @@
 	icon_state = "random_gnome"
 	spawn_loot_chance = 15
 	loot = list(
-		/obj/item/toy/plush/gnome = 25,
-		/obj/item/toy/plush/gnome/living = 1,
+		/obj/item/toy/plush/gnome
 	)
 
 /obj/effect/spawner/random/misc/gnome/fiftyfifty

diff --git a/code/game/objects/effects/weeds.dm b/code/game/objects/effects/weeds.dm
@@ -19,7 +19,6 @@
 	plane = FLOOR_PLANE
 	max_integrity = 25
 	ignore_weed_destruction = TRUE
-
 	var/obj/alien/weeds/node/parent_node
 	///The color variant of the sprite
 	var/color_variant = NORMAL_COLOR
@@ -152,10 +151,8 @@
 		vehicle.last_move_time += WEED_SLOWDOWN
 		return
 
-//RU TGMC EDIT
 	if(HAS_TRAIT(crosser, TRAIT_SUPER_STRONG))
 		return
-//RU TGMC EDIT
 
 	if(isxeno(crosser))
 		var/mob/living/carbon/xenomorph/X = crosser
@@ -172,10 +169,8 @@
 
 	if(victim.lying_angle)
 		return
-
 	victim.next_move_slowdown += WEED_SLOWDOWN
 
-
 /obj/alien/weeds/resting
 	name = "resting weeds"
 	desc = "This looks almost comfortable."
@@ -234,11 +229,11 @@
 		return ..()
 	return window.attackby(I, user, params)
 
-/obj/alien/weeds/weedwall/window/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+/obj/alien/weeds/weedwall/window/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
 	var/obj/structure/window = locate(window_type) in loc
 	if(!window)
 		return ..()
-	return window.attack_alien(X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+	return window.attack_alien(xeno_attacker, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
 
 /obj/alien/weeds/weedwall/window/frame
 	window_type = /obj/structure/window_frame
@@ -330,10 +325,8 @@
 		vehicle.last_move_time += WEED_SLOWDOWN
 		return
 
-//RU TGMC EDIT
 	if(HAS_TRAIT(crosser, TRAIT_SUPER_STRONG))
 		return
-//RU TGMC EDIT
 
 	if(!ishuman(crosser))
 		return