Skip to content

Commit 2565a76

Browse files
FourkhanDaKhankhansworth esq.
andauthored
Removes survivor research points; Makes nervestimulating harder to get. (#11455)
# About the pull request Research has been getting ahold of nerve-stimulating very quickly and easily. Because nervestimulating is the strongest property this can result in round-determining stims being sent very early. I removed NST combining into encephalophrasive and conflicting with focusing. These are mostly feels-bad gotchas more than anything. I don't think it takes any skill expression to memorize these existing. I reduced NST to level 2 on pheromone plasma. Leaving NST on phero plasma could be a wrong choice but the cost to research of going to 5-X (30ish points) is enough to delay a stim by about half an hour. They still need to procure a vial of pheromone plasma to even access this route, which is hardly guaranteed. # Explain why it's good for the game The prevalence of nervestimulating has become burdensome for Xenos; it's very hard to fight against and researchers have been getting it very consistently. It should not be consistently obtainable given how powerful it is. Survivors giving researchers enough points to create a stim instantly is obviously unbalanced and defeats the purpose of the mechanics researchers have to generate points themselves. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. N/A </details> # Changelog :cl: balance: Nervestimulating (anti-stun) is disabled in natural generation. balance: It can still be obtained from pheromone plasma on 5X clearance. balance: Scientist and corporate survivors no longer grant research points by swiping their IDs. /:cl: --------- Co-authored-by: khansworth esq. <[email protected]>
1 parent 6368052 commit 2565a76

File tree

6 files changed

+17
-39
lines changed

6 files changed

+17
-39
lines changed

code/__DEFINES/chemistry.dm

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
#define PROPERTY_HEMOGENIC "hemogenic"
186186
#define PROPERTY_YAUTJA_HEMOGENIC "yautja-hemogenic"
187187
#define PROPERTY_HEMOSTATIC "hemostatic"
188-
#define PROPERTY_NERVESTIMULATING "nerve-stimulating"
189188
#define PROPERTY_MUSCLESTIMULATING "muscle-stimulating"
190189
#define PROPERTY_PAINKILLING "painkilling"
191190
#define PROPERTY_HEPATOPEUTIC "hepatopeutic"
@@ -215,15 +214,15 @@
215214
#define PROPERTY_ADDICTIVE "addictive"
216215
#define PROPERTY_ENCEPHALOPHRASIVE "encephalophrasive"
217216
//Legendary, only in research hints. add this property to legendary list define if you're planning for it to be in normal research loop.
218-
#define PROPERTY_HYPERGENETIC "hypergenetic"
219217
#define PROPERTY_BOOSTING "boosting"
220-
#define PROPERTY_DNA_DISINTEGRATING "DNA-Disintegrating"
221-
#define PROPERTY_REGULATING "regulating"
222-
#define PROPERTY_OPTIMIZED "optimizing"
223218
#define PROPERTY_CIPHERING "ciphering"
224-
#define PROPERTY_ENCRYPTED "encrypted"
225219
#define PROPERTY_CIPHERING_PREDATOR "cross-ciphering"
220+
#define PROPERTY_DNA_DISINTEGRATING "DNA-Disintegrating"
221+
#define PROPERTY_ENCRYPTED "encrypted"
226222
#define PROPERTY_FIRE_PENETRATING "fire-penetrating"
223+
#define PROPERTY_HYPERGENETIC "hypergenetic"
224+
#define PROPERTY_OPTIMIZED "optimizing"
225+
#define PROPERTY_REGULATING "regulating"
227226
//Admin Only Properties
228227
#define PROPERTY_ORGAN_HEALING "organ-healing"
229228
#define PROPERTY_CROSSMETABOLIZING "cross-metabolizing"
@@ -242,14 +241,15 @@
242241
#define PROPERTY_VISCOUS "viscous"
243242
#define PROPERTY_EXPLOSIVE "explosive"
244243
//Generation Disabled Properties
245-
#define PROPERTY_CARDIOSTABILIZING "cardio-stabilizing"
246244
#define PROPERTY_AIDING "aiding"
247-
#define PROPERTY_THERMOSTABILIZING "themo-stabilizing"
248-
#define PROPERTY_OXYGENATING "oxygenating"
249-
#define PROPERTY_FOCUSING "focusing"
250245
#define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic"
251-
#define PROPERTY_UNKNOWN "unknown" //just has an OD effect
246+
#define PROPERTY_CARDIOSTABILIZING "cardio-stabilizing"
247+
#define PROPERTY_FOCUSING "focusing"
252248
#define PROPERTY_HEMOSITIC "hemositic"
249+
#define PROPERTY_NERVESTIMULATING "nerve-stimulating"
250+
#define PROPERTY_OXYGENATING "oxygenating"
251+
#define PROPERTY_THERMOSTABILIZING "themo-stabilizing"
252+
#define PROPERTY_UNKNOWN "unknown" //just has an OD effect
253253

254254
///Legendary properties, no PROPERTY_TYPE_ANOMALOUS, only normal ones.
255255
#define PROPERTY_LEGENDARY_LIST list(PROPERTY_HYPERGENETIC, PROPERTY_BOOSTING, PROPERTY_REGULATING, PROPERTY_OPTIMIZED)

code/_globalvars/global_lists.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ GLOBAL_LIST_INIT_TYPED(conflicting_properties, /list, list( PROPERTY_NUTRITIOUS
131131
PROPERTY_HYPERGENETIC = PROPERTY_PNEUMOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_OCULOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_CARDIOPEUTIC,\
132132
PROPERTY_HYPERGENETIC = PROPERTY_NEUROPEUTIC, PROPERTY_ADDICTIVE = PROPERTY_ANTIADDICTIVE, PROPERTY_NEUROSHIELDING = PROPERTY_NEUROTOXIC,\
133133
PROPERTY_HYPOMETABOLIC = PROPERTY_HYPERMETABOLIC, PROPERTY_HYPERTHROTTLING = PROPERTY_NEUROINHIBITING,
134-
PROPERTY_FOCUSING = PROPERTY_NERVESTIMULATING, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPERTHERMIC, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPOTHERMIC,
134+
PROPERTY_THERMOSTABILIZING = PROPERTY_HYPERTHERMIC, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPOTHERMIC,
135135
PROPERTY_AIDING = PROPERTY_NEUROINHIBITING, PROPERTY_OXYGENATING = PROPERTY_HYPOXEMIC, PROPERTY_ANTICARCINOGENIC = PROPERTY_CARCINOGENIC, \
136136
PROPERTY_CIPHERING = PROPERTY_CIPHERING_PREDATOR, PROPERTY_TRANSFORMATIVE = PROPERTY_ANTITOXIC, PROPERTY_INTRAVENOUS = PROPERTY_HYPERMETABOLIC,\
137137
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
145145
PROPERTY_ADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_NEUROTOXIC),\
146146
PROPERTY_CIPHERING_PREDATOR = list(PROPERTY_CIPHERING, PROPERTY_CROSSMETABOLIZING),\
147147
PROPERTY_FIRE_PENETRATING = list(PROPERTY_OXYGENATING, PROPERTY_VISCOUS),\
148-
PROPERTY_BONEMENDING = list(PROPERTY_CRYSTALLIZATION, PROPERTY_NUTRITIOUS),\
149-
PROPERTY_ENCEPHALOPHRASIVE = list(PROPERTY_NERVESTIMULATING, PROPERTY_PSYCHOSTIMULATING)))
148+
PROPERTY_BONEMENDING = list(PROPERTY_CRYSTALLIZATION, PROPERTY_NUTRITIOUS)))
149+
150150
//List of all id's from classed /datum/reagent datums indexed by class or tier. Used by chemistry generator and chem spawners.
151151
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()))
152152
//properties generated in chemicals, helps to make sure the same property doesn't show up 10 times

code/game/machinery/computer/research.dm

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,31 +57,13 @@
5757
var/obj/item/paper/research_report/CR = P.convert_to_chem_report()
5858
GLOB.chemical_data.save_document(CR, response, CR.name)
5959
return
60+
6061
//biomass rewards
6162
if(istype(B, /obj/item/research_upgrades/reroll))
6263
var/obj/item/research_upgrades/reroll/reroll = B
6364
GLOB.chemical_data.reroll_chemicals()
6465
visible_message(SPAN_NOTICE("[user] inserts [reroll] in [src], Rerolling contract chemicals."))
6566
qdel(reroll)
66-
//Clearance Card Updating
67-
if(!istype(B, /obj/item/card/id))
68-
return
69-
var/obj/item/card/id/silver/clearance_badge/card = B
70-
if(!istype(card))
71-
visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], but it is refused."))
72-
return
73-
if(!card.check_biometrics(user))
74-
visible_message(SPAN_WARNING("WARNING: ILLEGAL CLEARANCE USER DETECTED. ABORTING."))
75-
return
76-
77-
var/credits_to_add = max(card.credits_to_give - GLOB.chemical_data.credits_gained, 0)
78-
if(credits_to_add)
79-
GLOB.chemical_data.update_credits(credits_to_add)
80-
GLOB.chemical_data.credits_gained += credits_to_add
81-
82-
visible_message(SPAN_NOTICE("[user] swipes their ID card on [src], granting [credits_to_add] credits."))
83-
msg_admin_niche("[key_name(user)] has swiped a clearance card to give [credits_to_add] credits to research.")
84-
return
8567

8668
/obj/structure/machinery/computer/research/ui_state(mob/user)
8769
return GLOB.not_incapacitated_and_adjacent_strict_state

code/game/objects/items/cards_ids.dm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
desc = "A corporate holo-badge. It is fingerprint locked with clearance level 3 access. It is commonly held by corporate doctors."
182182
icon_state = "clearance"
183183
item_state = "silver_id"
184-
var/credits_to_give = 15 //gives the equivalent clearance access in credits
185184

186185
/obj/item/card/id/silver/clearance_badge/Initialize()
187186
. = ..()
@@ -190,21 +189,18 @@
190189
/obj/item/card/id/silver/clearance_badge/scientist
191190
name = "corporate scientist badge"
192191
desc = "A corporate holo-badge. It is fingerprint locked with clearance level 4 access. It is commonly held by corporate scientists."
193-
credits_to_give = 27
194192

195193
/obj/item/card/id/silver/clearance_badge/cl
196194
name = "corporate liaison badge"
197195
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."
198196
icon_state = "cl"
199197
item_state = "cl_id"
200-
credits_to_give = 42
201198

202199
/obj/item/card/id/silver/clearance_badge/manager
203200
name = "corporate manager badge"
204201
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."
205202
icon_state = "pmc"
206203
item_state = "cl_id"
207-
credits_to_give = 47
208204

209205
/obj/item/card/id/pizza
210206
name = "pizza guy badge"

code/modules/reagents/chemistry_properties/prop_positive.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
name = PROPERTY_NERVESTIMULATING
198198
code = "NST"
199199
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."
200-
rarity = PROPERTY_RARE
200+
rarity = PROPERTY_DISABLED
201201
category = PROPERTY_TYPE_STIMULANT
202202
value = 4
203203

code/modules/reagents/chemistry_reagents/other.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@
10411041
overdose_critical = REAGENTS_OVERDOSE_CRITICAL
10421042
chemclass = CHEM_CLASS_SPECIAL
10431043
objective_value = OBJECTIVE_EXTREME_VALUE
1044-
properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 3)
1044+
properties = list(PROPERTY_HALLUCINOGENIC = 8, PROPERTY_NERVESTIMULATING = 2)
10451045

10461046
/datum/reagent/plasma/chitin
10471047
name = "Chitin Plasma"

0 commit comments

Comments
 (0)