Merge branch 'ARF-SS13:master' into master

ARF-SS13 · Oct 15, 2024 · d70de50 · d70de50
2 parents 313a2fd + ebe9a80
commit d70de50
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 37 deletions.
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
@@ -1095,10 +1095,10 @@
 /client/proc/adminGreet(logout)
 	if(SSticker.HasRoundStarted())
 		var/string
-		if(logout && CONFIG_GET(flag/announce_admin_logout))
-			string = pick(
-				"Admin logout: [key_name(src)]")
-		else if(!logout && CONFIG_GET(flag/announce_admin_login) && (prefs.toggles & ANNOUNCE_LOGIN))
+	// 	if(logout && CONFIG_GET(flag/announce_admin_logout))
+	// 		string = pick(
+	// 			"Admin logout: [key_name(src)]")
+		if(!logout /* && CONFIG_GET(flag/announce_admin_login) && (prefs.toggles & ANNOUNCE_LOGIN) */)
 			string = pick(
 				"Admin login: [key_name(src)]")
 		if(string)

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -324,7 +324,7 @@ Works together with spawning an observer, noted above.
 		if(src.timeofdeath == 0)
 			ghost.timeofdeath = world.time
 	if(!check_rights_for(src.client, R_ADMIN))
-		message_admins("[key_name(src)] is now a ghost.")
+		//message_admins("[key_name(src)] is now a ghost.")
 		log_world("[key_name(src)] is now a ghost.")
 	return ghost
 

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -671,7 +671,7 @@ GLOBAL_LIST_INIT(personalitytrait2description, list(
 				continue
 			/// The return of the cursed href link!!!
 			msg += {"<a href='?src=[REF(user)];read_personality_trait=[triat];>[emoji]</a>"}
-	if(!isnull(msg))
+	// if(!isnull(msg))
 		//out = "[span_info("They have some cool traits! Click the emojis to learn more!")]\n"
 	out += msg
 	out +="\n"

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/fallout_NPC.dm b/code/modules/mob/living/simple_animal/hostile/f13/fallout_NPC.dm
@@ -57,7 +57,6 @@
 /mob/living/simple_animal/hostile/vault/dweller/Aggro()
 	..()
 	summon_backup(15)
-	say("HELP!!")
 
 /mob/living/simple_animal/hostile/vault/dweller/dweller1
 	icon_state = "vault_dweller1"
@@ -224,7 +223,7 @@
 /mob/living/simple_animal/hostile/enclave/scientist/Aggro()
 	..()
 	summon_backup(15)
-	say("Intruder!!") 
+
 
 // Enclave Armored Infantry
 /mob/living/simple_animal/hostile/enclave/soldier

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/ghoul.dm b/code/modules/mob/living/simple_animal/hostile/f13/ghoul.dm
@@ -144,8 +144,6 @@
 	if(.)
 		return
 	summon_backup(15)
-	if(!ckey)
-		say(pick("*scrungy", "*mbark"))
 
 
 /mob/living/simple_animal/hostile/ghoul/become_the_mob(mob/user)

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm
@@ -259,8 +259,7 @@
 	if(.)
 		return
 	summon_backup(15)
-	if(!ckey)
-		say("KILL 'EM, FELLAS!")
+
 
 /mob/living/simple_animal/hostile/raider/ranged/boss/mangomatt
 	name = "Mango Mathew and his Merry Meth Madlads"
@@ -304,15 +303,7 @@
 /mob/living/simple_animal/hostile/raider/ranged/boss/mangomatt/Aggro()
 	..()
 	summon_backup(15)
-	say(pick(\
-		"*nya",\
-		"*mrowl",\
-		"*lynx",\
-		"*cougar",\
-		"*growl",\
-		"*come",\
-		"Fuck em' up!"\
-		))
+
 	loot = list(/obj/effect/spawner/lootdrop/f13/uncommon, /obj/effect/spawner/lootdrop/f13/rare)
 	loot_drop_amount = 10
 	loot_amount_random = TRUE
@@ -366,15 +357,7 @@
 /mob/living/simple_animal/hostile/raider/ranged/boss/blueberrybates/Aggro()
 	..()
 	summon_backup(15)
-	say(pick(\
-		"TO ME, BOYS!",\
-		"KICK THEIR ASS!",\
-		"Fuck 'em up!",\
-		"*chitter",\
-		"*kyaa",\
-		"*come",\
-		"YOU'RE ABOUT TO GET A DISCOUNT ON A GRAVE, BUDDY!",\
-		))
+
 
 // RANGED RAIDER WITH ARMOR
 /mob/living/simple_animal/hostile/raider/ranged/sulphiteranged

diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
@@ -34,8 +34,6 @@
 /mob/living/simple_animal/hostile/nanotrasen/Aggro()
 	..()
 	summon_backup(15)
-	say("411 in progress, requesting backup!")
-
 
 /mob/living/simple_animal/hostile/nanotrasen/ranged
 	icon_state = "nanotrasenranged"

diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -67,7 +67,7 @@
 /mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/Aggro()
 	..()
 	summon_backup(15)
-	say("411 in progress, requesting backup!")
+
 
 /mob/living/simple_animal/hostile/retaliate/nanotrasenpeace/ranged
 	icon_state = "nanotrasenrangedsmg"

diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -71,4 +71,3 @@
 /mob/living/simple_animal/hostile/russian/ranged/officer/Aggro()
 	..()
 	summon_backup(15)
-	say("V BOJ!!")
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -169,7 +169,6 @@
 /mob/living/simple_animal/hostile/renegade/syndicate/civilian/Aggro()
 	..()
 	summon_backup(15)
-	say("GUARDS!!")
 
 /// Redsuit Guys ///
 /mob/living/simple_animal/hostile/renegade/syndicate/space

diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm
@@ -11,7 +11,7 @@
 	name = "Metal Rod"
 	id = "rods"
 	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 1000)
+	materials = list(/datum/material/iron = 500)
 	build_path = /obj/item/stack/rods
 	category = list("initial","Construction")
 	maxstack = 50

diff --git a/modular_sunset/code/mob/renegade.dm b/modular_sunset/code/mob/renegade.dm
@@ -42,7 +42,7 @@
 /mob/living/simple_animal/hostile/renegade/Aggro()
 	..()
 	summon_backup(10)
-	say("Target spotted!")
+
 
 
 // LIGHT RANGED VARIANT