Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts: code/setup.dm
2026-08-23 03:57:48 +01:00 · 2015-08-17 09:37:49 +02:00
parent 7b5b7162d0 b062b59200
commit 55bc41241f
31 changed files with 327 additions and 288 deletions
@@ -189,7 +189,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/dead/observer/Stat()
 	..()
 	if(statpanel("Status"))
-		stat(null, "Station Time: [worldtime2text()]")
 		if(emergency_shuttle)
 			var/eta_status = emergency_shuttle.get_status_panel_eta()
 			if(eta_status)
@@ -97,10 +97,12 @@
 	..(message, null, verb)

 /mob/living/bot/Bump(var/atom/A)
-	if(istype(A, /obj/machinery/door) && botcard)
+	if(on && botcard && istype(A, /obj/machinery/door))
 		var/obj/machinery/door/D = A
 		if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && D.check_access(botcard))
 			D.open()
+	else
+		..()

 /mob/living/bot/emag_act(var/remaining_charges, var/mob/user)
 	return 0
@@ -11,6 +11,11 @@
 	is_ranged = 1
 	preparing_arrest_sounds = new()

+	a_intent = I_HURT
+	mob_bump_flag = HEAVY
+	mob_swap_flags = ~HEAVY
+	mob_push_flags = HEAVY
+
 	var/shot_delay = 4
 	var/last_shot = 0

@@ -30,7 +30,7 @@

 	var/obj/secbot_listener/listener = null
 	var/beacon_freq = 1445			// Navigation beacon frequency
-	var/control_freq = AI_FREQ		// Bot control frequency
+	var/control_freq = BOT_FREQ		// Bot control frequency
 	var/list/path = list()
 	var/frustration = 0
 	var/turf/patrol_target = null	// This is where we are headed
@@ -82,5 +82,5 @@
 	var/list/flavor_texts = list()

 	mob_bump_flag = HUMAN
-	mob_push_flags = ALLMOBS
-	mob_swap_flags = ALLMOBS
+	mob_push_flags = ~HEAVY
+	mob_swap_flags = ~HEAVY
@@ -134,9 +134,9 @@
 		)

 	// Bump vars
-	var/bump_flag = HUMAN		// What are we considered to be when bumped?
-	var/push_flags = ALLMOBS	// What can we push?
-	var/swap_flags = ALLMOBS	// What can we swap place with?
+	var/bump_flag = HUMAN	// What are we considered to be when bumped?
+	var/push_flags = ~HEAVY	// What can we push?
+	var/swap_flags = ~HEAVY	// What can we swap place with?

 /datum/species/New()
 	if(hud_type)
@@ -53,8 +53,8 @@
 		)

 	bump_flag = ALIEN
-	swap_flags = ALLMOBS
-	push_flags = ALLMOBS ^ ROBOT
+	swap_flags = ~HEAVY
+	push_flags = (~HEAVY) ^ ROBOT

 	var/alien_number = 0
 	var/caste_name = "creature" // Used to update alien name.
@@ -128,7 +128,6 @@ proc/get_radio_key_from_channel(var/channel)
 	return verb

 /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="")
-
 	if(client)
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (Muted)."
@@ -171,7 +170,7 @@ proc/get_radio_key_from_channel(var/channel)
 		// irrespective of distance or anything else.
 		if(speaking.flags & HIVEMIND)
 			speaking.broadcast(src,trim(message))
-			return
+			return 1
 		//If we've gotten this far, keep going!
 		if(speaking.flags & COMMON_VERBS)
 			verb = say_quote(message)
@@ -188,11 +187,11 @@ proc/get_radio_key_from_channel(var/channel)
 		verb = handle_s[2]

 	if(!message || message == "")
-		return
+		return 0

 	var/list/obj/item/used_radios = new
 	if(handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name))
-		return
+		return 1

 	var/list/handle_v = handle_speech_sound()
 	var/sound/speech_sound = handle_v[1]
@@ -78,6 +78,8 @@

 	for(var/datum/ai_law/law in laws.laws_to_state())
 		can_state = statelaw("[prefix][law.get_index()]. [law.law]")
+		if(!can_state)
+			break

 	if(!can_state)
 		src << "<span class='danger'>[method]: Unable to state laws. Communication method unavailable.</span>"
@@ -37,4 +37,4 @@
 			else if(M.stat == 2 &&  M.client.prefs.toggles & CHAT_GHOSTEARS)
 				if(M.client) M << "<b>[src]</b> transmits, \"[message]\""
 		return 1
-	..(message)
+	return ..(message, 0)
@@ -10,7 +10,7 @@

 	mob_bump_flag = ROBOT
 	mob_swap_flags = ROBOT|MONKEY|SLIME|SIMPLE_ANIMAL
-	mob_push_flags = ALLMOBS //trundle trundle
+	mob_push_flags = ~HEAVY //trundle trundle

 	var/lights_on = 0 // Is our integrated light on?
 	var/used_power_this_tick = 0
@@ -1,3 +1,6 @@
+/mob/living/silicon/say(var/message, var/sanitize = 1)
+	return ..(sanitize ? sanitize(message) : message)
+
 /mob/living/silicon/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
 	log_say("[key_name(src)] : [message]")

@@ -151,12 +151,6 @@
 /mob/living/silicon/proc/show_malf_ai()
 	return 0

-
-// this function displays the station time in the status panel
-/mob/living/silicon/proc/show_station_time()
-	stat(null, "Station Time: [worldtime2text()]")
-
-
 // this function displays the shuttles ETA in the status panel if the shuttle has been called
 /mob/living/silicon/proc/show_emergency_shuttle_eta()
 	if(emergency_shuttle)
@@ -168,7 +162,6 @@
 // This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
 /mob/living/silicon/Stat()
 	if(statpanel("Status"))
-		show_station_time()
 		show_emergency_shuttle_eta()
 		show_system_integrity()
 		show_malf_ai()
@@ -654,16 +654,21 @@
 	. = (client && client.inactivity < 1200)

 	if(.)
+		if(statpanel("Status") && ticker && ticker.current_state != GAME_STATE_PREGAME)
+			stat("Station Time", worldtime2text())
+			stat("Round Duration", round_duration())
+
 		if(client.holder)
 			if(statpanel("Status"))
-				statpanel("Status","Location:","([x], [y], [z])")
-				statpanel("Status","CPU:","[world.cpu]")
-				statpanel("Status","Instances:","[world.contents.len]")
-			if(statpanel("Status") && processScheduler && processScheduler.getIsRunning())
-				for(var/datum/controller/process/P in processScheduler.processes)
-					statpanel("Status",P.getStatName(), P.getTickTime())
-			else
-				statpanel("Status","processScheduler is not running.")
+				stat("Location:","([x], [y], [z])")
+			if(statpanel("Processes"))
+				stat("CPU:","[world.cpu]")
+				stat("Instances:","[world.contents.len]")
+				if(processScheduler && processScheduler.getIsRunning())
+					for(var/datum/controller/process/P in processScheduler.processes)
+						stat(P.getStatName(), P.getTickTime())
+				else
+					stat("processScheduler is not running.")

 		if(listed_turf && client)
 			if(!TurfAdjacent(listed_turf))
@@ -729,7 +734,7 @@
 		drop_l_hand()
 		drop_r_hand()
 	else
-		density = 1
+		density = initial(density)

 	for(var/obj/item/weapon/grab/G in grabbed_by)
 		if(G.state >= GRAB_AGGRESSIVE)
@@ -1089,4 +1094,4 @@ mob/proc/yank_out_object()
 /mob/proc/throw_mode_on()
 	src.in_throw_mode = 1
 	if(src.throw_icon)
-		src.throw_icon.icon_state = "act_throw_on"
+		src.throw_icon.icon_state = "act_throw_on"
@@ -67,12 +67,7 @@
 	Stat()
 		..()

-		statpanel("Status")
-		if (client.statpanel == "Status" && ticker)
-			if (ticker.current_state != GAME_STATE_PREGAME)
-				stat(null, "Station Time: [worldtime2text()]")
-		statpanel("Lobby")
-		if(client.statpanel=="Lobby" && ticker)
+		if(statpanel("Lobby") && ticker)
 			if(ticker.hide_mode)
 				stat("Game Mode:", "Secret")
 			else
@@ -387,16 +382,11 @@
 			global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")

 	proc/LateChoices()
-		var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
-		//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
-		var/mins = (mills % 36000) / 600
-		var/hours = mills / 36000
-
 		var/name = client.prefs.be_random_name ? "friend" : client.prefs.real_name

 		var/dat = "<html><body><center>"
 		dat += "<b>Welcome, [name].<br></b>"
-		dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"
+		dat += "Round Duration: [round_duration()]<br>"

 		if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
 			if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled