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

Conflicts: code/modules/client/preference/preferences_toggles.dm
2026-08-25 04:57:12 +01:00 · 2016-06-30 17:40:10 -07:00
parent 82091296bd 12532b4c2c
commit 567e1576f5
98 changed files with 696 additions and 402 deletions
@@ -106,19 +106,19 @@ var/savefile/Banlist

 	Banlist.cd = "/base"
 	if ( Banlist.dir.Find("[ckey][computerid]") )
-		to_chat(usr, text("\red Ban already exists."))
+		to_chat(usr, "<span class='danger'>Ban already exists.</span>")
 		return 0
 	else
 		Banlist.dir.Add("[ckey][computerid]")
 		Banlist.cd = "/base/[ckey][computerid]"
-		to_chat(Banlist["key"], ckey)
-		to_chat(Banlist["id"], computerid)
-		to_chat(Banlist["ip"], address)
-		to_chat(Banlist["reason"], reason)
-		to_chat(Banlist["bannedby"], bannedby)
-		to_chat(Banlist["temp"], temp)
+		Banlist["key"] << ckey
+		Banlist["id"] << computerid
+		Banlist["ip"] << address
+		Banlist["reason"] << reason
+		Banlist["bannedby"] << bannedby
+		Banlist["temp"] << temp
 		if (temp)
-			to_chat(Banlist["minutes"], bantimestamp)
+			Banlist["minutes"] << bantimestamp
 		if(!temp)
 			add_note(ckey, "Permanently banned - [reason]", null, bannedby, 0)
 		else
@@ -211,17 +211,17 @@ var/savefile/Banlist
 			Banlist.cd = "/base"
 			Banlist.dir.Add("trash[i]trashid[i]")
 			Banlist.cd = "/base/trash[i]trashid[i]"
-			to_chat(Banlist["key"], "trash[i]")
+			Banlist["key"] << "trash[i]"
 		else
 			Banlist.cd = "/base"
 			Banlist.dir.Add("[last]trashid[i]")
 			Banlist.cd = "/base/[last]trashid[i]"
-			to_chat(Banlist["key"], last)
-		to_chat(Banlist["id"], "trashid[i]")
-		to_chat(Banlist["reason"], "Trashban[i].")
-		to_chat(Banlist["temp"], a)
-		to_chat(Banlist["minutes"], CMinutes + rand(1,2000))
-		to_chat(Banlist["bannedby"], "trashmin")
+			Banlist["key"] << last
+		Banlist["id"] << "trashid[i]"
+		Banlist["reason"] << "Trashban[i]."
+		Banlist["temp"] << a
+		Banlist["minutes"] << CMinutes + rand(1,2000)
+		Banlist["bannedby"] << "trashmin"
 		last = "trash[i]"

 	Banlist.cd = "/base"
@@ -186,9 +186,9 @@
 	set name = "Hear/Silence Instruments"
 	set category = "Preferences"
 	set desc = "Toggles hearing musical instruments like the violin and piano"
-	prefs.toggles ^= SOUND_INSTRUMENTS
+	prefs.sound ^= SOUND_INSTRUMENTS
 	prefs.save_preferences(src)
-	if(prefs.toggles & SOUND_INSTRUMENTS)
+	if(prefs.sound & SOUND_INSTRUMENTS)
 		to_chat(src, "You will now hear people playing musical instruments.")
 	else
 		to_chat(src, "You will no longer hear musical instruments.")
@@ -354,7 +354,7 @@
 	speech_verb = "growls"
 	ask_verb = "gnarls"
 	exclaim_verb = "snarls"
-	colour = "rough"
+	colour = "gutter"
 	key = "3"
 	syllables = list ("gra","ba","ba","breh","bra","rah","dur","ra","ro","gro","go","ber","bar","geh","heh", "gra")

@@ -217,7 +217,7 @@
 		if(judgebot.check_for_weapons(r_hand))
 			threatcount += 4

-	//Loyalty implants imply trustworthyness
+	//Mindshield implants imply trustworthyness
 	if(isloyal(src))
 		threatcount -= 1

@@ -1882,7 +1882,7 @@
 		threatcount += 2


-	//Loyalty implants imply trustworthyness
+	//Mindshield implants imply slight trustworthiness
 	if(isloyal(src))
 		threatcount -= 1

@@ -191,14 +191,14 @@
 					if(isloyal(target))
 						to_chat(usr, "<span class='notice'>They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.</span>")
 						usr.visible_message("<span class='danger'>[usr] stops talking for a moment, then moves back away from [target].</span>")
-						to_chat(target, "<span class='danger'>Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.</span>")
+						to_chat(target, "<span class='danger'>Your mindshield implant activates, protecting you from conversion.</span>")
 						return
 				if(3)
 					to_chat(usr, "<span class='notice'>You begin filling out the application form with [target].</span>")
 					usr.visible_message("<span class='danger'>[usr] pulls out a pen and paper and begins filling an application form with [target].</span>")
 					to_chat(target, "<span class='danger'>You are being convinced by [usr] to fill out an application form to become a henchman.</span>")//Ow the edge

-			if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant
+			if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a mindshield implant
 				to_chat(usr, "<span class='danger'>The enrollment process has been interrupted - you have lost the attention of [target].</span>")
 				to_chat(target, "<span class='warning'>You move away and are no longer under the charm of [usr]. The application form is null and void.</span>")
 				recruiting = 0
@@ -637,7 +637,7 @@
 		return -1

 	if(!held_item)
-		to_chat(usr, "<span class='warning'>You have nothing to drop!</span>")
+		to_chat(src, "<span class='warning'>You have nothing to drop!</span>")
 		return 0

 	if(!drop_gently)
@@ -1329,11 +1329,11 @@ mob/proc/yank_out_object()

 /mob/proc/get_ghost(even_if_they_cant_reenter = 0)
 	if(mind)
-		for(var/mob/dead/observer/G in dead_mob_list)
-			if(G.mind == mind)
-				if(G.can_reenter_corpse || even_if_they_cant_reenter)
-					return G
-				break
+		return mind.get_ghost(even_if_they_cant_reenter)
+
+/mob/proc/grab_ghost(force)
+	if(mind)
+		return mind.grab_ghost(force = force)

 /mob/proc/notify_ghost_cloning(var/message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", var/sound = 'sound/effects/genetics.ogg', var/atom/source = null)
 	var/mob/dead/observer/ghost = get_ghost()
@@ -22,7 +22,7 @@
 			return 0
 	return 1

-/proc/isloyal(A) //Checks to see if the person contains a loyalty implant, then checks that the implant is actually inside of them
+/proc/isloyal(A) //Checks to see if the person contains a mindshield implant, then checks that the implant is actually inside of them
 	for(var/obj/item/weapon/implant/loyalty/L in A)
 		if(L && L.implanted)
 			return 1
@@ -90,12 +90,12 @@

 		if(ticker.current_state == GAME_STATE_PREGAME)
 			stat("Players:", "[totalPlayers]")
-			if(client.holder)
+			if(check_rights(R_ADMIN, 0, src))
 				stat("Players Ready:", "[totalPlayersReady]")
 			totalPlayers = 0
 			totalPlayersReady = 0
 			for(var/mob/new_player/player in player_list)
-				if(client.holder)
+				if(check_rights(R_ADMIN, 0, src))
 					stat("[player.key]", (player.ready)?("(Playing)"):(null))
 				totalPlayers++
 				if(player.ready)
@@ -577,7 +577,7 @@

 /obj/item/weapon/paper/armory
 	name = "paper- 'Armory Inventory'"
-	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>6 Gas Masks<br>1 Lockbox of Loyalty Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Advanced Tasers"
+	info = "4 Deployable Barriers<br>4 Portable Flashers<br>1 Mechanical Toolbox<br>2 Boxes of Spare Handcuffs<br>1 Box of Flashbangs<br>1 Box of Spare R.O.B.U.S.T. Cartridges<br>1 Tracking Implant Kit<br>1 Chemical Implant Kit<br>1 Box of Tear Gas Grenades<br>1 Explosive Ordnance Disposal Suit<br>1 Biohazard Suit<br>6 Gas Masks<br>1 Lockbox of Mindshield Implants<br>1 Ion Rifle<br>3 Sets of Riot Equipment<br>2 Sets of Security Hardsuits<br>1 Ablative Armor Vest<br>3 Bulletproof Vests<br>3 Helmets<br><br>2 Riot Shotguns<br>2 Boxes of Beanbag Shells<br>3 Laser Guns<br>3 Energy Guns<br>3 Advanced Tasers"

 /obj/item/weapon/paper/firingrange
 	name = "paper- 'Firing Range Instructions'"
@@ -279,13 +279,13 @@
 	desc = "A projector that emits high density quantum-coupled bluespace beams."
 	ammo_type = list(/obj/item/ammo_casing/energy/wormhole, /obj/item/ammo_casing/energy/wormhole/orange)
 	item_state = null
-	icon_state = "wormhole_projector100"
+	icon_state = "wormhole_projector1"
 	var/obj/effect/portal/blue
 	var/obj/effect/portal/orange


 /obj/item/weapon/gun/energy/wormhole_projector/update_icon()
-	icon_state = "[initial(icon_state)][select]"
+	icon_state = "wormhole_projector[select]"
 	item_state = icon_state
 	return

@@ -306,6 +306,8 @@
 /obj/item/weapon/gun/energy/wormhole_projector/proc/create_portal(obj/item/projectile/beam/wormhole/W)
 	var/obj/effect/portal/P = new /obj/effect/portal(get_turf(W), null, src)
 	P.precision = 0
+	P.failchance = 0
+	P.can_multitool_to_remove = 1
 	if(W.name == "bluespace beam")
 		qdel(blue)
 		blue = P
@@ -683,7 +683,7 @@

 /obj/machinery/computer/shuttle/Topic(href, href_list)
 	if(..())
-		return
+		return 1
 	usr.set_machine(src)
 	src.add_fingerprint(usr)
 	if(!allowed(usr))
@@ -726,7 +726,8 @@
 	admin_controlled = 1

 /obj/machinery/computer/shuttle/ferry/request/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 	if(href_list["request"])
 		if(cooldown)
 			return
@@ -801,7 +802,8 @@ var/global/trade_dockrequest_timelimit = 0
 	..(user)

 /obj/machinery/computer/shuttle/trade/Topic(href, href_list)
-	..()
+	if(..())
+		return 1
 	if(href_list["request"])
 		if(world.time < trade_dockrequest_timelimit || world.time < trade_dock_timelimit)
 			return
@@ -13,7 +13,6 @@
 	var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
 	var/auto_door_open = TRUE
 	var/needs_gravity = 0//To allow non-space vehicles to move in no gravity or not, mostly for adminbus
-
 	//Pixels
 	var/generic_pixel_x = 0 //All dirs show this pixel_x for the driver
 	var/generic_pixel_y = 0 //All dirs shwo this pixel_y for the driver
@@ -144,7 +143,7 @@
 	if(has_gravity(src))
 		return 1

-	if(pulledby)
+	if(pulledby && pulledby != buckled_mob)	// no pulling the vehicle you're driving through space!
 		return 1

 	if(needs_gravity)