[BASICALLY MODULAR] Runs grep checks on modular_skyrat and fixes all …

…issues (#17469) * Runs grep checks on modular_skyrat and fixes all issues * feather * Update modular_skyrat/modules/verbs/code/say.dm Co-authored-by: Zonespace <[email protected]> * loadout descs * fixes Co-authored-by: Zonespace <[email protected]>
Fluffy-Frontier · Nov 16, 2022 · 07071ee · 07071ee
1 parent 5e307d3
commit 07071ee
Show file tree

Hide file tree

Showing 77 changed files with 993 additions and 878 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -41,6 +41,7 @@ jobs:
           bash tools/ci/check_filedirs.sh tgstation.dme
           bash tools/ci/check_changelogs.sh
           bash tools/ci/check_grep.sh
+          bash skyrat/tools/skyrat_check_grep.sh # SKYRAT EDIT ADDITION - checking modular_skyrat code
           bash tools/ci/check_misc.sh
           tools/bootstrap/python tools/validate_dme.py <tgstation.dme
           tools/build/build --ci lint tgui-test

diff --git a/modular_skyrat/master_files/code/game/objects/items/AI_modules.dm b/modular_skyrat/master_files/code/game/objects/items/AI_modules.dm
@@ -1,7 +1,7 @@
 /obj/item/ai_module/core/full/dagothbot
 	name = "'God Complex' Core AI Module"
 	law_id = "dagothbot"
-  
+
 /obj/item/ai_module/core/full/texas
 	name = "'Frontier Ranger' Core AI Module"
 	law_id = "texas"
diff --git a/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm b/modular_skyrat/master_files/code/game/objects/structures/trash_pile.dm
@@ -82,7 +82,7 @@
 			return
 	. = ..()
 
-/obj/structure/trash_pile/proc/eject_mob(var/mob/living/hidden_mob)
+/obj/structure/trash_pile/proc/eject_mob(mob/living/hidden_mob)
 	hidden_mob.forceMove(src.loc)
 	playsound(hidden_mob.loc, 'sound/machines/chime.ogg', 50, FALSE, -5)
 	hidden_mob.do_alert_animation(hidden_mob)

diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm
@@ -73,7 +73,7 @@
 /*
 *	NT CONSULTANT
 */
-//See Blueshield note - tl;dr, this role is a station role, while Centcomm.dmi is more event roles
+//See Blueshield note - tl;dr, this role is a station role, while Centcom.dmi is more event roles
 
 /obj/item/clothing/under/rank/nanotrasen_consultant
 	icon = 'modular_skyrat/master_files/icons/obj/clothing/under/command.dmi'

diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
@@ -26,7 +26,7 @@
 	icon_state = "util_sec_old"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate //MOVE ALL /SYNDICATES TO THE SYNDICATE.DM WHEN THE .dmi IS MADE (soon, after centcomm.dmi)
+/obj/item/clothing/under/rank/security/skyrat/utility/redsec/syndicate //MOVE ALL /SYNDICATES TO THE SYNDICATE.DM WHEN THE .dmi IS MADE (soon, after centcom.dmi)
 	armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 50, ACID = 40) //Same stats as the tactical turtleneck.
 	has_sensor = NO_SENSORS
 

diff --git a/modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm b/modular_skyrat/master_files/code/modules/industrial_lift/tram_lift_master.dm
@@ -1,12 +1,12 @@
 /**
  * Damage calculation for getting hit by the tram. 120 to 240 damage to the player at a lethality of 4. A chance of death, but it's going to hurt.
-var/damage = rand(5, 10) * collision_lethality
-				collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_HEAD)
-				collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_CHEST)
-				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_LEG)
-				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_LEG)
-				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_ARM)
-				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_ARM)
+ * var/damage = rand(5, 10) * collision_lethality
+ *				collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_HEAD)
+ *				collided.apply_damage(2 * damage, BRUTE, BODY_ZONE_CHEST)
+ *				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_LEG)
+ *				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_LEG)
+ *				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_L_ARM)
+ *				collided.apply_damage(0.5 * damage, BRUTE, BODY_ZONE_R_ARM)
  */
 /datum/lift_master/tram
 	collision_lethality = 4
diff --git a/modular_skyrat/modules/SEVA_suit/code/suit_voucher.dm b/modular_skyrat/modules/SEVA_suit/code/suit_voucher.dm
@@ -10,8 +10,10 @@
 //Code to redeem new items at the mining vendor using the suit voucher
 //More items can be added in the lists and in the if statement.
 /obj/machinery/mineral/equipment_vendor/proc/RedeemSVoucher(obj/item/suit_voucher/voucher, mob/redeemer)
-	var/items = list("SEVA suit" = image(icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', icon_state = "seva"),
-					 "Explorer suit" = image(icon = 'icons/obj/clothing/suits/utility.dmi', icon_state = "explorer"))
+	var/items = list(
+		"SEVA suit" = image(icon = 'modular_skyrat/master_files/icons/obj/clothing/uniforms.dmi', icon_state = "seva"),
+		"Explorer suit" = image(icon = 'icons/obj/clothing/suits/utility.dmi', icon_state = "explorer"),
+	)
 
 	var/selection = show_radial_menu(redeemer, src, items, require_near = TRUE, tooltips = TRUE)
 	if(!selection || !Adjacent(redeemer) || QDELETED(voucher) || voucher.loc != redeemer)

diff --git a/modular_skyrat/modules/admin/code/fix_chat.dm b/modular_skyrat/modules/admin/code/fix_chat.dm
@@ -1,6 +1,8 @@
 /client/proc/fix_say()
-    set name = "Fix say for players"
-    set category = "Admin"
-    for(var/player in GLOB.player_list)
-        if(isnull(player))
-            GLOB.player_list -= player
+	set name = "Fix say for players"
+	set category = "Admin"
+	for(var/player in GLOB.player_list)
+		if(!isnull(player))
+			continue
+
+		GLOB.player_list -= player
diff --git a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm
@@ -342,7 +342,7 @@
 	icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/external.dmi'
 	overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/external/overlays.dmi'
 
-//CENTCOMM
+//CENTCOM
 /obj/machinery/door/airlock/centcom
 	icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/centcom.dmi'
 	overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/centcom/overlays.dmi'

diff --git a/modular_skyrat/modules/altborgs/code/robot_model.dm b/modular_skyrat/modules/altborgs/code/robot_model.dm
@@ -324,14 +324,14 @@
 	)
 
 /obj/item/robot_model/syndicatejack/rebuild_modules()
-    ..()
-    var/mob/living/silicon/robot/syndicatejack = loc
-    syndicatejack.scrambledcodes = TRUE // We're rouge now
+	. = ..()
+	var/mob/living/silicon/robot/syndicatejack = loc
+	syndicatejack.scrambledcodes = TRUE // We're rouge now
 
 /obj/item/robot_model/syndicatejack/remove_module(obj/item/I, delete_after)
-    ..()
-    var/mob/living/silicon/robot/syndicatejack = loc
-    syndicatejack.scrambledcodes = FALSE // Friends with the AI again
+	. = ..()
+	var/mob/living/silicon/robot/syndicatejack = loc
+	syndicatejack.scrambledcodes = FALSE // Friends with the AI again
 
 //NINJA
 /obj/item/robot_model/ninja

diff --git a/modular_skyrat/modules/altborgs/code/robot_upgrade.dm b/modular_skyrat/modules/altborgs/code/robot_upgrade.dm
@@ -1,9 +1,9 @@
 /obj/item/borg/upgrade/transform/syndicatejack
-    name = "borg module picker (Syndicate)"
-    desc = "Allows you to to turn a cyborg into a experimental syndicate cyborg."
-    icon_state = "cyborg_upgrade3"
-    new_model = /obj/item/robot_model/syndicatejack
+	name = "borg module picker (Syndicate)"
+	desc = "Allows you to to turn a cyborg into a experimental syndicate cyborg."
+	icon_state = "cyborg_upgrade3"
+	new_model = /obj/item/robot_model/syndicatejack
 
 /obj/item/borg/upgrade/transform/syndicatejack/action(mob/living/silicon/robot/cyborg, user = usr) // Only usable on emagged cyborgs. In exchange. makes you unable to get locked down or detonated.
-    if(cyborg.emagged)
-        return ..()
+	if(cyborg.emagged)
+		return ..()
diff --git a/modular_skyrat/modules/automapper/code/automapper_subsystem.dm b/modular_skyrat/modules/automapper/code/automapper_subsystem.dm
@@ -73,7 +73,7 @@ SUBSYSTEM_DEF(automapper)
 		map_names = list(map_names)
 	for(var/datum/map_template/automap_template/iterating_template as anything in preloaded_map_templates)
 		if(iterating_template.affects_builtin_map && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names))
-			// CentComm already started loading objects, place them in the netherzone
+			// CentCom already started loading objects, place them in the netherzone
 			for(var/turf/old_turf as anything in iterating_template.get_affected_turfs(iterating_template.load_turf, FALSE))
 				init_contents(old_turf)
 		else if(!(iterating_template.required_map in map_names))

diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm
@@ -94,8 +94,8 @@
 /obj/item/gun/energy/laser/hellgun/blueshield
 	name = "\improper Allstar SC-3 PDW 'Hellfire'"
 	desc = "A prototype energy carbine, despite NT's ban on hellfire weaponry due to negative press. \
-            Allstar continued to work on it, compacting it into a small form-factor for personal defense. \
-            As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use."
+		Allstar continued to work on it, compacting it into a small form-factor for personal defense. \
+		As part of the Asset Retention Program created by Nanotrasen, Allstar's prototype began to be put into use."
 	icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns.dmi'
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	lefthand_file = 'modular_skyrat/modules/aesthetics/guns/icons/guns_lefthand.dmi'

diff --git a/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm b/modular_skyrat/modules/blueshield/code/blueshield_clothing.dm
@@ -3,13 +3,13 @@
 //Uniform items are in command.dm
 
 /obj/item/clothing/gloves/tackler/combat/insulated/blueshield
-    name = "combat gloves"
-    desc = "These tactical gloves appear to be unique, made out of double woven durathread fibers which make it fireproof as well as acid resistant"
-    icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
-    icon_state = "combat"
-    worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
-    resistance_flags = FIRE_PROOF |  ACID_PROOF
-    armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "fire" = 100, "acid" = 100)
+	name = "combat gloves"
+	desc = "These tactical gloves appear to be unique, made out of double woven durathread fibers which make it fireproof as well as acid resistant"
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
+	icon_state = "combat"
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
+	resistance_flags = FIRE_PROOF |  ACID_PROOF
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "fire" = 100, "acid" = 100)
 
 /obj/item/radio/headset/headset_bs
 	name = "\proper the blueshield's headset"

diff --git a/modular_skyrat/modules/cargo/code/goodies.dm b/modular_skyrat/modules/cargo/code/goodies.dm
@@ -6,22 +6,28 @@
 	name = "Emergency Air Supplies (Nitrogen)"
 	desc = "A vox breathing mask and nitrogen tank."
 	cost = PAYCHECK_CREW
-	contains = list(/obj/item/tank/internals/nitrogen/belt,
-                    /obj/item/clothing/mask/breath/vox)
+	contains = list(
+		/obj/item/tank/internals/nitrogen/belt,
+		/obj/item/clothing/mask/breath/vox,
+	)
 
 /datum/supply_pack/goody/airsuppliesoxygen
 	name = "Emergency Air Supplies (Oxygen)"
 	desc = "A breathing mask and emergency oxygen tank."
 	cost = PAYCHECK_CREW
-	contains = list(/obj/item/tank/internals/emergency_oxygen,
-                    /obj/item/clothing/mask/breath)
+	contains = list(
+		/obj/item/tank/internals/emergency_oxygen,
+		/obj/item/clothing/mask/breath,
+	)
 
 /datum/supply_pack/goody/airsuppliesplasma
 	name = "Emergency Air Supplies (Plasma)"
 	desc = "A breathing mask and plasmaman plasma tank."
 	cost = PAYCHECK_CREW
-	contains = list(/obj/item/tank/internals/plasmaman/belt,
-                    /obj/item/clothing/mask/breath)
+	contains = list(
+		/obj/item/tank/internals/plasmaman/belt,
+		/obj/item/clothing/mask/breath,
+	)
 
 /*
 *	ENGINEERING STUFF
@@ -70,8 +76,10 @@
 	name = "Gun Maintenance Kits"
 	desc = "Keep your pa's rifle in best condition, with two sets of cleaning supplies. Or your standard issue pistol if you're an itchy trigger, we're not here to judge."
 	cost = PAYCHECK_CREW * 3
-	contains = list(/obj/item/gun_maintenance_supplies,
-					/obj/item/gun_maintenance_supplies)
+	contains = list(
+		/obj/item/gun_maintenance_supplies,
+		/obj/item/gun_maintenance_supplies,
+	)
 
 /*
 *	CARPET PACKS