Additions+Bug Fixes: Tarkov is gone & backpack additions. (#391)

* murderstarkov * Update flavor_misc.dm * medicalbackpacks --------- Co-authored-by: Aurelian D. Rainer <[email protected]>
Foundation-19 · Mar 20, 2024 · 4a427ad · 4a427ad
1 parent e5cd74b
commit 4a427ad
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 49 deletions.
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
@@ -161,13 +161,28 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
 #define DDUFFELBAG "Department Duffel Bag"
 GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything after this point is a non-department backpack
 	"Hiking Backpack" = /obj/item/storage/backpack,
+	"Medical Backpack" = /obj/item/storage/backpack/medic,
 	"Service Backpack" = /obj/item/storage/backpack/enclave,
+	"Security Backpack" = /obj/item/storage/backpack/security,
+	"Trekkers Pack" = /obj/item/storage/backpack/trekker,
+	"Trophy Rack" = /obj/item/storage/backpack/cultpack,
+	"Explorer Bag" = /obj/item/storage/backpack/explorer,
 	"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
+	"Medical Duffel Bag" = /obj/item/storage/backpack/duffelbag/med,
+	"Security Duffel Bag" = /obj/item/storage/backpack/duffelbag/sec,
 	"Grey Satchel" = /obj/item/storage/backpack/satchel,
 	"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
 	"Bone Satchel" = /obj/item/storage/backpack/satchel/bone,
+	"Explorer Satchel" = /obj/item/storage/backpack/satchel/explorer,
+	"Medical Satchel" = /obj/item/storage/backpack/satchel/med,
 	"Old Satchel" = /obj/item/storage/backpack/satchel/old,
-	"Service Satchel" = /obj/item/storage/backpack/satchel/enclave
+	"Service Satchel" = /obj/item/storage/backpack/satchel/enclave,
+	"Security Satchel" = /obj/item/storage/backpack/satchel/sec,
+	"Trekkers Satchel" = /obj/item/storage/backpack/satchel/trekker,
+	"Messenger Bag" = /obj/item/storage/backpack/messenger,
+	"Explorer Messanger Bag" = /obj/item/storage/backpack/messenger/explorer,
+	"Security Messenger Bag" = /obj/item/storage/backpack/messenger/security,
+	"Blueshield Messenger Bag" = /obj/item/storage/backpack/messenger/blue,
 	))
 
 //Suit/Skirt

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
@@ -723,14 +723,16 @@ SUBSYSTEM_DEF(job)
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
 	var/list/chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
+	var/datum/preferences/the_prefs = the_mob.client.prefs
 	if(the_mob.client && the_mob.client.prefs && (chosen_gear && chosen_gear.len))
 		if(!ishuman(M))//no silicons allowed
 			return
 		for(var/i in chosen_gear)
 			var/datum/gear/G = istext(i[LOADOUT_ITEM]) ? text2path(i[LOADOUT_ITEM]) : i[LOADOUT_ITEM]
-			G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)]
-			if(!G)
+			if(!G) // aint there? ditch it
+				the_prefs.remove_gear_from_loadout(the_prefs.loadout_slot, i[LOADOUT_ITEM])
 				continue
+			G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)]
 			var/permitted = TRUE
 			if(!bypass_prereqs && G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles))
 				permitted = FALSE

diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -784,3 +784,27 @@
 	desc = "Not be used outside of Russia"
 	icon_state = "ScavPack"
 	item_state = "ScavPack" 
+
+/obj/item/storage/backpack/messenger
+	name = "black messenger bag"
+	desc = "A black messenger bag"
+	icon_state = "messenger"
+	item_state = "messenger"
+
+/obj/item/storage/backpack/messenger/explorer
+	name = "explorer messanger bag"
+	desc = "A messenger bag"
+	icon_state = "messenger_explorer"
+	item_state = "messenger_explorer"
+
+/obj/item/storage/backpack/messenger/security
+	name = "security messenger"
+	desc = "A security messenger bag"
+	icon_state = "messenger_security_black"
+	item_state = "messenger_security_black"
+
+/obj/item/storage/backpack/messenger/blue
+	name = "blueshield messanger"
+	desc = "A black messenger with dark blue accents"
+	icon_state = "messenger_blueshield"
+	item_state = "messenger_blueshield"
diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
@@ -37,13 +37,7 @@
 	var/seed_modifier = 0
 	if(seed)
 		seed_modifier = round(seed.potency / 25)
-	var/obj/item/stack/cotton = new cotton_type(user.loc, 1 + seed_modifier)
-	var/old_cotton_amount = cotton.amount
-	for(var/obj/item/stack/ST in user.loc)
-		if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount)
-			ST.attackby(cotton, user)
-	if(cotton.amount > old_cotton_amount)
-		to_chat(user, "<span class='notice'>You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].</span>")
+	new cotton_type(user.loc, 1 + seed_modifier)
 	qdel(src)
 
 //reinforced mutated variant

diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi
diff --git a/icons/mob/inhands/equipment/backpack_righthand.dmi b/icons/mob/inhands/equipment/backpack_righthand.dmi
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm
@@ -80,6 +80,8 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
 
 //ckey only check
 /datum/gear/proc/donator_ckey_check(key)
-	if(ckeywhitelist && ckeywhitelist.Find(key))
-		return TRUE
-	return IS_CKEY_DONATOR_GROUP(key, donator_group_id)
+	if(LAZYLEN(ckeywhitelist))
+		for(var/needed_key in ckeywhitelist)
+			if(ckey(needed_key) == ckey(key))
+				return TRUE
+	//return IS_CKEY_DONATOR_GROUP(key, donator_group_id)
diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm
@@ -219,48 +219,15 @@
 
 /// Backpacks
 
+/*			 Removed due to people backpack stacking like they are playing Tarkov, the only ones in this section are faction special ones, such as the legion flags.
 /datum/gear/backpack/bbackpack
 	name = "hiking backpack"
 	path = /obj/item/storage/backpack/old
 	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS
 	cost = 3
+*/
 
-/datum/gear/backpack/bbackpack/duffel
-	name = "duffelbag"
-	path = /obj/item/storage/backpack/duffelbag
-
-/datum/gear/backpack/bbackpack/explorer
-	name = "explorer backpack"
-	path = /obj/item/storage/backpack/explorer
-
-/datum/gear/backpack/bbackpack/explorer/satchel
-	name = "explorer satchel"
-	path = /obj/item/storage/backpack/satchel/explorer
-
-/datum/gear/backpack/bbackpack/trekker
-	name = "trekker backpack"
-	path = /obj/item/storage/backpack/trekker
-
-/datum/gear/backpack/bbackpack/trekker/satchel
-	name = "trekker satchel"
-	path = /obj/item/storage/backpack/satchel/trekker
-
-/datum/gear/backpack/bbackpack/sec
-	name = "security backpack"
-	path = /obj/item/storage/backpack/security
-	cost = 4
-
-/datum/gear/backpack/bbackpack/sec/satchel
-	name = "security satchel"
-	path = /obj/item/storage/backpack/satchel/sec
-
-/datum/gear/backpack/bbackpack/trophy
-	name = "trophy rack"
-	path = /obj/item/storage/backpack/cultpack
-	cost = 3
-
-
-/datum/gear/backpack/bbackpack/legionr
+/datum/gear/backpack/bbackpack
 	name = "legion red cape backpack"
 	path = /obj/item/storage/backpack/legionr
 	subcategory = LOADOUT_SUBCATEGORY_BACKPACK_BACKPACKS