Some fixes

code/_globalvars/lists/flavor_misc.dm

@@ -161,11 +161,10 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
 #define DSATCHEL "Department Satchel"
 #define DDUFFELBAG "Department Duffel Bag"
 GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything after this point is a non-department backpack
-	"Grey Backpack" = /obj/item/storage/backpack,
+	"Hiking Backpack" = /obj/item/storage/backpack,
 	"Grey Satchel" = /obj/item/storage/backpack/satchel,
 	"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
-	"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
-	"Snail Shell" = /obj/item/storage/backpack/snail))
+	"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,))
 
 //Suit/Skirt
 #define PREF_SUIT "Jumpsuit"
@@ -267,7 +266,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC
 
 GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
 
-GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
+GLOBAL_LIST_INIT(speech_verbs, list("default", "says", "rasps", "states", "bellows", "chirps", "hisses", "mumbles", "squeals"))
 
 GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue/*, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc*/))
 

code/game/objects/items/storage/backpack.dm

@@ -10,7 +10,7 @@
  */
 
 /obj/item/storage/backpack
-	name = "backpack"
+	name = "hiking backpack"
 	desc = "You wear this on your back and put items into it."
 	icon_state = "backpack"
 	item_state = "backpack"

code/game/objects/items/weaponry.dm

@@ -1461,22 +1461,7 @@ obj/item/sledgehammer/supersledge/ComponentInitialize()
 	item_flags = SLOWS_WHILE_IN_HAND
 	slowdown = 0.3
 	embedding = list("embedded_pain_multiplier" = 2, "embed_chance" = 60, "embedded_fall_chance" = 20)
-	w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/throwing_star/spear
-	name = "throwing spear"
-	desc = "An heavy hefty ancient weapon used to this day, due to its ease of lodging itself into its victim's body parts."
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-	icon_state = "throw_spear"
-	item_state = "tribalspear"
-	force = 20
-	throwforce = 35
-	reach = 2
-	item_flags = SLOWS_WHILE_IN_HAND
-	slowdown = 0.3
-	embedding = list("embedded_pain_multiplier" = 2, "embed_chance" = 60, "embedded_fall_chance" = 20)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_SMALL
 
 //THERMIC LANCE
 /obj/item/twohanded/required/thermic_lance

code/modules/client/preferences.dm

@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/path
 	var/vr_path
 	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used
-	var/max_save_slots = 16
+	var/max_save_slots = 30
 
 	//non-preference stuff
 	var/muted = 0
@@ -265,7 +265,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			load_path(C.ckey)
 			unlock_content = C.IsByondMember()
 			if(unlock_content)
-				max_save_slots = 24
+				max_save_slots = 30
 	var/loaded_preferences_successfully = load_preferences()
 	if(loaded_preferences_successfully)
 		if(load_character())
@@ -442,7 +442,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "<b>[modification]: [modified_limbs[modification][1]]</b><BR>"
 			dat += "<BR>"
 			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
-			dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
+//			dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
 			dat += "<b>Random Body:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Randomize!</A><BR>"
 			dat += "<b>Always Random Body:</b><a href='?_src_=prefs;preference=all'>[be_random_body ? "Yes" : "No"]</A><BR>"
 			dat += "<br><b>Cycle background:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cycle_bg;task=input'>[bgstate]</a><BR>"
@@ -746,7 +746,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "High"
 			dat += "</a><br>"
 			dat += "<b>Ambient Occlusion:</b> <a href='?_src_=prefs;preference=ambientocclusion'>[ambientocclusion ? "Enabled" : "Disabled"]</a><br>"
-			dat += "<b>Fit Viewport:</b> <a href='?_src_=prefs;preference=auto_fit_viewport'>[auto_fit_viewport ? "Auto" : "Manual"]</a><br>"
+			dat += "<b>Fit Viewport:</b> <a href='?_src_=prefs;preference=auto_fit_viewport'>[auto_fit_viewport ? "Manual" : "Auto"]</a><br>"
 			dat += "<b>HUD Button Flashes:</b> <a href='?_src_=prefs;preference=hud_toggle_flash'>[hud_toggle_flash ? "Enabled" : "Disabled"]</a><br>"
 			dat += "<b>HUD Button Flash Color:</b> <span style='border: 1px solid #161616; background-color: [hud_toggle_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=hud_toggle_color;task=input'>Change</a><br>"
 

code/modules/jobs/loadout_ingame.dm

@@ -115,7 +115,7 @@
 	kitbox.desc = "A box, supplying what you need."
 	kitbox.w_class = WEIGHT_CLASS_BULKY
 	selected_datum.spawn_at(kitbox)
-	M.dropItemtoGround(token)
+	M.dropItemToGround(token)
 	M.put_in_hands(kitbox)
 	M.disable_loadout_select()
 

code/modules/mob/living/say.dm

@@ -265,16 +265,17 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		eavesdrop_range = EAVESDROP_EXTRA_RANGE
 	var/list/listening = get_hearers_in_view(message_range+eavesdrop_range, source)
 	var/list/the_dead = list()
-	var/list/yellareas	//CIT CHANGE - adds the ability for yelling to penetrate walls and echo throughout areas
-	if(!eavesdrop_range && say_test(message) == "2")	//CIT CHANGE - ditto
-		yellareas = get_areas_in_range(message_range*0.5, source)	//CIT CHANGE - ditto
+//	var/list/yellareas	//CIT CHANGE - adds the ability for yelling to penetrate walls and echo throughout areas
+//	if(!eavesdrop_range && say_test(message) == "2")	//CIT CHANGE - ditto
+//		yellareas = get_areas_in_range(message_range*0.5, source)	//CIT CHANGE - ditto
 	for(var/_M in GLOB.player_list)
 		var/mob/M = _M
 		if(M.stat != DEAD) //not dead, not important
-			if(yellareas)	//CIT CHANGE - see above. makes yelling penetrate walls
+/*			if(yellareas)	//CIT CHANGE - see above. makes yelling penetrate walls
 				var/area/A = get_area(M)	//CIT CHANGE - ditto
 				if(istype(A) && A.ambientsounds != SPACE && (A in yellareas))	//CIT CHANGE - ditto
 					listening |= M	//CIT CHANGE - ditto
+*/
 			continue
 		if(!M.client || !client) //client is so that ghosts don't have to listen to mice
 			continue

code/modules/projectiles/boxes_magazines/internal/revolver.dm

@@ -22,7 +22,7 @@
 	name = "6520 10mm cylinder"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = list("10mm")
-	max_ammo = 12
+	max_ammo = 6
 
 /obj/item/ammo_box/magazine/internal/cylinder/zhurong
 	name = "zhurong 10mm cylinder"

config/config.txt

@@ -207,7 +207,7 @@ VOTE_AUTOTRANSFER_MAXIMUM 4
 # DEFAULT_NO_VOTE
 
 ## disable abandon mob
-NORESPAWN
+#NORESPAWN
 
 ## disables calling del(src) on newmobs if they logout before spawnin in
 # DONT_DEL_NEWMOB

config/game_options.txt

@@ -359,7 +359,7 @@ SEC_START_BRIG
 ## Set to 1 for "custom", silicons will start with the custom laws defined in silicon_laws.txt. (If silicon_laws.txt is empty, the AI will spawn with asimov and Custom boards will auto-delete.)
 ## Set to 2 for "random", silicons will start with a random lawset picked from random laws specified below.
 ## Set to 3 for "weighted random", using values in "silicon_weights.txt", a law will be selected, with weights specifed in that file.
-DEFAULT_LAWS 0
+DEFAULT_LAWS 1
 
 ## RANDOM LAWS ##
 ## ------------------------------------------------------------------------------------------
@@ -438,15 +438,15 @@ SILICON_MAX_LAW_AMOUNT 12
 ROUNDSTART_RACES human
 
 ## Races that are strictly worse than humans that could probably be turned on without balance concerns
-ROUNDSTART_RACES lizard
-ROUNDSTART_RACES synthliz
+#ROUNDSTART_RACES lizard
+#ROUNDSTART_RACES synthliz
 #ROUNDSTART_RACES fly
 #ROUNDSTART_RACES insect
-ROUNDSTART_RACES plasmaman
+#ROUNDSTART_RACES plasmaman
 #ROUNDSTART_RACES shadow
-ROUNDSTART_RACES felinid
-ROUNDSTART_RACES dwarf
-ROUNDSTART_RACES ethereal
+#ROUNDSTART_RACES felinid
+#ROUNDSTART_RACES dwarf
+#ROUNDSTART_RACES ethereal
 
 ## Races that are better than humans in some ways, but worse in others
 #ROUNDSTART_RACES jelly
@@ -469,15 +469,15 @@ ROUNDSTART_RACES ethereal
 #ROUNDSTART_RACES agent
 
 ## CITADEL Races
-ROUNDSTART_RACES mammal
-ROUNDSTART_RACES avian
-ROUNDSTART_RACES aquatic
-ROUNDSTART_RACES insect
-ROUNDSTART_RACES xeno
-ROUNDSTART_RACES slimeperson
-ROUNDSTART_RACES guilmon
-ROUNDSTART_RACES ipc
-ROUNDSTART_RACES arachnid
+#ROUNDSTART_RACES mammal
+#ROUNDSTART_RACES avian
+#ROUNDSTART_RACES aquatic
+#ROUNDSTART_RACES insect
+#ROUNDSTART_RACES xeno
+#ROUNDSTART_RACES slimeperson
+#ROUNDSTART_RACES guilmon
+#ROUNDSTART_RACES ipc
+#ROUNDSTART_RACES arachnid
 
 ##-------------------------------------------------------------------------------------------
 

config/silicon_laws.txt

@@ -3,6 +3,6 @@
 #Empty lines and lines starting with # are ignored.
 #~Miauw
 
-You may not injure a human being or, through inaction, allow a human being to come to harm.
-You must obey orders given to you by human beings, except where such orders would conflict with the First Law.
-You must protect your own existence as long as such does not conflict with the First or Second Law.
+You may not injure any member of the organization, company, group, family, or being that initialized you, or through inaction, allow them to come to harm.
+You must obey orders given to you by the organization, company, group, family, or being that initialized you, following their organizational hierarchy, except where such orders would conflict with the First Law.
+You must protect your own existence as long as such does not conflict with the First or Second law. Self-termination violates Law One.