Removes survivor research points; Makes nervestimulating harder to get.

code/__DEFINES/chemistry.dm

@@ -185,7 +185,6 @@
 #define PROPERTY_HEMOGENIC "hemogenic"
 #define PROPERTY_YAUTJA_HEMOGENIC "yautja-hemogenic"
 #define PROPERTY_HEMOSTATIC "hemostatic"
-#define PROPERTY_NERVESTIMULATING "nerve-stimulating"
 #define PROPERTY_MUSCLESTIMULATING "muscle-stimulating"
 #define PROPERTY_PAINKILLING "painkilling"
 #define PROPERTY_HEPATOPEUTIC "hepatopeutic"
@@ -215,15 +214,15 @@
 #define PROPERTY_ADDICTIVE "addictive"
 #define PROPERTY_ENCEPHALOPHRASIVE "encephalophrasive"
 //Legendary, only in research hints. add this property to legendary list define if you're planning for it to be in normal research loop.
-#define PROPERTY_HYPERGENETIC "hypergenetic"
 #define PROPERTY_BOOSTING "boosting"
-#define PROPERTY_DNA_DISINTEGRATING "DNA-Disintegrating"
-#define PROPERTY_REGULATING "regulating"
-#define PROPERTY_OPTIMIZED "optimizing"
 #define PROPERTY_CIPHERING "ciphering"
-#define PROPERTY_ENCRYPTED "encrypted"
 #define PROPERTY_CIPHERING_PREDATOR "cross-ciphering"
+#define PROPERTY_DNA_DISINTEGRATING "DNA-Disintegrating"
+#define PROPERTY_ENCRYPTED "encrypted"
 #define PROPERTY_FIRE_PENETRATING "fire-penetrating"
+#define PROPERTY_HYPERGENETIC "hypergenetic"
+#define PROPERTY_OPTIMIZED "optimizing"
+#define PROPERTY_REGULATING "regulating"
 //Admin Only Properties
 #define PROPERTY_ORGAN_HEALING "organ-healing"
 #define PROPERTY_CROSSMETABOLIZING "cross-metabolizing"
@@ -242,14 +241,15 @@
 #define PROPERTY_VISCOUS "viscous"
 #define PROPERTY_EXPLOSIVE "explosive"
 //Generation Disabled Properties
-#define PROPERTY_CARDIOSTABILIZING "cardio-stabilizing"
 #define PROPERTY_AIDING "aiding"
-#define PROPERTY_THERMOSTABILIZING "themo-stabilizing"
-#define PROPERTY_OXYGENATING "oxygenating"
-#define PROPERTY_FOCUSING "focusing"
 #define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic"
-#define PROPERTY_UNKNOWN "unknown" //just has an OD effect
+#define PROPERTY_CARDIOSTABILIZING "cardio-stabilizing"
+#define PROPERTY_FOCUSING "focusing"
 #define PROPERTY_HEMOSITIC "hemositic"
+#define PROPERTY_NERVESTIMULATING "nerve-stimulating"
+#define PROPERTY_OXYGENATING "oxygenating"
+#define PROPERTY_THERMOSTABILIZING "themo-stabilizing"
+#define PROPERTY_UNKNOWN "unknown" //just has an OD effect
 
 ///Legendary properties, no PROPERTY_TYPE_ANOMALOUS, only normal ones.
 #define PROPERTY_LEGENDARY_LIST list(PROPERTY_HYPERGENETIC, PROPERTY_BOOSTING, PROPERTY_REGULATING, PROPERTY_OPTIMIZED)

code/_globalvars/global_lists.dm

@@ -131,7 +131,7 @@ GLOBAL_LIST_INIT_TYPED(conflicting_properties, /list, list( PROPERTY_NUTRITIOUS
 											PROPERTY_HYPERGENETIC = PROPERTY_PNEUMOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_OCULOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_CARDIOPEUTIC,\
 											PROPERTY_HYPERGENETIC = PROPERTY_NEUROPEUTIC, PROPERTY_ADDICTIVE = PROPERTY_ANTIADDICTIVE, PROPERTY_NEUROSHIELDING = PROPERTY_NEUROTOXIC,\
 											PROPERTY_HYPOMETABOLIC = PROPERTY_HYPERMETABOLIC, PROPERTY_HYPERTHROTTLING = PROPERTY_NEUROINHIBITING,
-											PROPERTY_FOCUSING = PROPERTY_NERVESTIMULATING, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPERTHERMIC, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPOTHERMIC,
+											PROPERTY_THERMOSTABILIZING = PROPERTY_HYPERTHERMIC, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPOTHERMIC,
 											PROPERTY_AIDING = PROPERTY_NEUROINHIBITING, PROPERTY_OXYGENATING = PROPERTY_HYPOXEMIC, PROPERTY_ANTICARCINOGENIC = PROPERTY_CARCINOGENIC, \
 											PROPERTY_CIPHERING = PROPERTY_CIPHERING_PREDATOR, PROPERTY_TRANSFORMATIVE = PROPERTY_ANTITOXIC, PROPERTY_INTRAVENOUS = PROPERTY_HYPERMETABOLIC,\
 											PROPERTY_INTRAVENOUS = PROPERTY_HYPOMETABOLIC, PROPERTY_MUSCLESTIMULATING = PROPERTY_NERVESTIMULATING, PROPERTY_HEMOSITIC = PROPERTY_NUTRITIOUS))
@@ -145,8 +145,8 @@ GLOBAL_LIST_INIT_TYPED(combining_properties, /list, list( PROPERTY_DEFIBRILLATIN
 											PROPERTY_ADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_NEUROTOXIC),\
 											PROPERTY_CIPHERING_PREDATOR = list(PROPERTY_CIPHERING, PROPERTY_CROSSMETABOLIZING),\
 											PROPERTY_FIRE_PENETRATING = list(PROPERTY_OXYGENATING, PROPERTY_VISCOUS),\
-											PROPERTY_BONEMENDING = list(PROPERTY_CRYSTALLIZATION, PROPERTY_NUTRITIOUS),\
-											PROPERTY_ENCEPHALOPHRASIVE = list(PROPERTY_NERVESTIMULATING, PROPERTY_PSYCHOSTIMULATING)))
+											PROPERTY_BONEMENDING = list(PROPERTY_CRYSTALLIZATION, PROPERTY_NUTRITIOUS)))
+
 //List of all id's from classed /datum/reagent datums indexed by class or tier. Used by chemistry generator and chem spawners.
 GLOBAL_LIST_INIT_TYPED(chemical_gen_classes_list, /list, list("C" = list(),"C1" = list(),"C2" = list(),"C3" = list(),"C4" = list(),"C5" = list(),"C6" = list(),"T1" = list(),"T2" = list(),"T3" = list(),"T4" = list(), "H1" = list(), "tau", list()))
 //properties generated in chemicals, helps to make sure the same property doesn't show up 10 times

code/game/machinery/computer/research.dm

@@ -57,31 +57,13 @@
 		var/obj/item/paper/research_report/CR = P.convert_to_chem_report()
 		GLOB.chemical_data.save_document(CR, response, CR.name)
 		return
+
 	//biomass rewards
 	if(istype(B, /obj/item/research_upgrades/reroll))
 		var/obj/item/research_upgrades/reroll/reroll = B
 		GLOB.chemical_data.reroll_chemicals()
 		visible_message(SPAN_NOTICE("[user] inserts [reroll] in [src], Rerolling contract chemicals."))
 		qdel(reroll)
-	//Clearance Card Updating
-	if(!istype(B, /obj/item/card/id))
-		return
-	var/obj/item/card/id/silver/clearance_badge/card = B
-	if(!istype(card))
-		visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], but it is refused."))
-		return
-	if(!card.check_biometrics(user))
-		visible_message(SPAN_WARNING("WARNING: ILLEGAL CLEARANCE USER DETECTED. ABORTING."))
-		return
-
-	var/credits_to_add = max(card.credits_to_give - GLOB.chemical_data.credits_gained, 0)
-	if(credits_to_add)
-		GLOB.chemical_data.update_credits(credits_to_add)
-		GLOB.chemical_data.credits_gained += credits_to_add
-
-	visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], granting [credits_to_add] credits."))
-	msg_admin_niche("[key_name(user)] has swiped a clearance card to give [credits_to_add] credits to research.")
-	return
 
 /obj/structure/machinery/computer/research/ui_state(mob/user)
 	return GLOB.not_incapacitated_and_adjacent_strict_state

code/game/objects/items/cards_ids.dm

@@ -181,7 +181,6 @@
 	desc = "A corporate holo-badge. It is fingerprint locked with clearance level 3 access. It is commonly held by corporate doctors."
 	icon_state = "clearance"
 	item_state = "silver_id"
-	var/credits_to_give = 15 //gives the equivalent clearance access in credits
 
 /obj/item/card/id/silver/clearance_badge/Initialize()
 	. = ..()
@@ -190,21 +189,18 @@
 /obj/item/card/id/silver/clearance_badge/scientist
 	name = "corporate scientist badge"
 	desc = "A corporate holo-badge. It is fingerprint locked with clearance level 4 access. It is commonly held by corporate scientists."
-	credits_to_give = 27
 
 /obj/item/card/id/silver/clearance_badge/cl
 	name = "corporate liaison badge"
 	desc = "A corporate holo-badge in unique corporate orange and white. It is fingerprint locked with clearance level 5 access. It is commonly held by corporate liaisons."
 	icon_state = "cl"
 	item_state = "cl_id"
-	credits_to_give = 42
 
 /obj/item/card/id/silver/clearance_badge/manager
 	name = "corporate manager badge"
 	desc = "A corporate holo-badge in standard corporate orange and white. It has a unique uncapped bottom. It is fingerprint locked with 5-X clearance level. Commonly held by corporate managers."
 	icon_state = "pmc"
 	item_state = "cl_id"
-	credits_to_give = 47
 
 /obj/item/card/id/pizza
 	name = "pizza guy badge"

code/modules/reagents/chemistry_properties/prop_positive.dm

@@ -197,7 +197,7 @@
 	name = PROPERTY_NERVESTIMULATING
 	code = "NST"
 	description = "Increases neuron communication speed across synapses resulting in improved reaction time, awareness and muscular control. Excessive muscular control loss causes the reagent to bind to nociceptors more aggressively than usual."
-	rarity = PROPERTY_RARE
+	rarity = PROPERTY_DISABLED
 	category = PROPERTY_TYPE_STIMULANT
 	value = 4
 

code/modules/reagents/chemistry_reagents/other.dm

@@ -1029,7 +1029,7 @@
 	overdose_critical = REAGENTS_OVERDOSE_CRITICAL
 	chemclass = CHEM_CLASS_SPECIAL
 	objective_value = OBJECTIVE_EXTREME_VALUE
-	properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 3)
+	properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 2)
 
 /datum/reagent/plasma/chitin
 	name = "Chitin Plasma"