Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2941c14

Browse filesBrowse files
Anvilman6SomeguyManperson
Anvilman6
and
SomeguyManperson
authored
Experimental: Racial modifier adjustments (yogstation13#12193)
* Racial modifier adjustments Changes most all racial damage and environmental modifiers to create more unique experiences for each (see PR body for numbers) * Oops Removes thing that I thought I removed the first time * I forgor Ethereal electric boogaloo * The angriest man who ever lived WRONG PLANT LEVER * Maybe fixes it Indent not spaces * Merge conflict resolution ruins everything * Sssssss * Engaging lightspeed properly this time Thank you Reed for clarifying a variable * Replaces pod change I overwrote (whoops) Speedmod .33 back in * Corrected an oversight in one of my past PRs Why do we even HAVE two plantpeople files * Preternis adjustments per above draft comments We do a little pushing to stop PR from staling while I'm kept way too busy and depressed with actual job work * Adds Mqiib's scaling lizard stunmod code Integrates a code block created by Mqiib to fulfill his suggestion earlier in the thread. Rather than giving Lizards a flat 5% stun time increase, as was previously proposed, this now gives them a variable stun time that scales with temperature. Higher temps give lower stun time, and cold temps giving higher - scaling from 91% (-9% from baseline) stun times in heat to 133% (+33% from baseline) stun times in cold. Immersive semi cold-blooded coding! Co-authored-by: Theos <theubernyan@gmail.com>
1 parent b76b04b commit 2941c14
Copy full SHA for 2941c14

7 files changed

+58-10Lines changed: 58 additions & 10 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/modules/mob/living/carbon/human/species_types/ethereal.dm‎

Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/human/species_types/ethereal.dm
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010
mutantstomach = /obj/item/organ/stomach/ethereal
1111
exotic_blood = /datum/reagent/consumable/liquidelectricity //Liquid Electricity. fuck you think of something better gamer
1212
siemens_coeff = 0.5 //They thrive on energy
13-
brutemod = 1.25 //They're weak to punches
13+
brutemod = 1.5 //Don't rupture their membranes
14+
burnmod = 0.8 //Bodies are resilient to heat and energy
15+
heatmod = 0.5 //Bodies are resilient to heat and energy
16+
coldmod = 2.0 //Don't extinguish the stars
17+
speedmod = -0.1 //Light and energy move quickly
18+
punchdamagehigh = 11 //Fire hand more painful
19+
punchstunthreshold = 11 //Still stuns on max hit, but subsequently lower chance to stun overall
1420
payday_modifier = 0.7 //Neutrally useful to NT
1521
attack_type = BURN //burn bish
1622
damage_overlay_type = "" //We are too cool for regular damage overlays
Collapse file

‎code/modules/mob/living/carbon/human/species_types/lizardpeople.dm‎

Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+25-2Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs")
1010
mutanttongue = /obj/item/organ/tongue/lizard
1111
mutanttail = /obj/item/organ/tail/lizard
12-
coldmod = 1.5
13-
heatmod = 0.67
12+
coldmod = 1.75 //Desert-born race
13+
heatmod = 0.75 //Desert-born race
1414
payday_modifier = 0.6 //Negatively viewed by NT
1515
default_features = list("mcolor" = "0F0", "tail_lizard" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs")
1616
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
@@ -27,6 +27,8 @@
2727
screamsound = 'yogstation/sound/voice/lizardperson/lizard_scream.ogg' //yogs - lizard scream
2828
wings_icon = "Dragon"
2929
species_language_holder = /datum/language_holder/lizard
30+
var/heat_stunmod = 0
31+
var/last_heat_stunmod = 0
3032

3133
/datum/species/lizard/random_name(gender,unique,lastname)
3234
if(unique)
@@ -39,6 +41,27 @@
3941

4042
return randname
4143

44+
45+
/datum/species/lizard/handle_environment(datum/gas_mixture/environment, mob/living/carbon/human/H)
46+
..()
47+
last_heat_stunmod = heat_stunmod //Saves previous mod
48+
if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
49+
heat_stunmod = 1 //lizard gets faster when warm
50+
else if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(H, TRAIT_RESISTCOLD))
51+
switch(H.bodytemperature)
52+
if(200 to BODYTEMP_COLD_DAMAGE_LIMIT) //but slower
53+
heat_stunmod = -1
54+
if(120 to 200)
55+
heat_stunmod = -2 //and slower
56+
else
57+
heat_stunmod = -3 //and sleepier as they get colder
58+
else
59+
heat_stunmod = 0
60+
var/heat_stun_mult = 1.1**(last_heat_stunmod - heat_stunmod) //1.1^(difference between last and current values)
61+
if(heat_stun_mult != 1) //If they're the same 1.1^0 is 1, so no change, if we go up we divide by 1.1
62+
stunmod *= heat_stun_mult //however many times, and if it goes down we multiply by 1.1
63+
//This gets us an effective stunmod of 0.91, 1, 1.1, 1.21, 1.33, based on temp
64+
4265
/*
4366
Lizard subspecies: ASHWALKERS
4467
*/
Collapse file

‎code/modules/mob/living/carbon/human/species_types/mothmen.dm‎

Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/human/species_types/mothmen.dm
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
liked_food = VEGETABLES | DAIRY | CLOTH
1616
disliked_food = FRUIT | GROSS
1717
toxic_food = MEAT | RAW | SEAFOOD
18+
burnmod = 1.25 //Fluffy and flammable
19+
brutemod = 0.9 //Evasive buggers
20+
punchdamagehigh = 9 //Weird fluffy bug fist
21+
punchstunthreshold = 10 //No stun punches
1822
mutanteyes = /obj/item/organ/eyes/moth
1923
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
2024
species_language_holder = /datum/language_holder/mothmen
Collapse file

‎code/modules/mob/living/carbon/human/species_types/plasmamen.dm‎

Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
mutanttongue = /obj/item/organ/tongue/bone/plasmaman
1313
mutantliver = /obj/item/organ/liver/plasmaman
1414
mutantstomach = /obj/item/organ/stomach/plasmaman
15-
burnmod = 1.5
16-
heatmod = 1.5
17-
brutemod = 1.5
15+
burnmod = 1.5 //Lives in suits and burns easy. Lasers are bad for this
16+
heatmod = 1.5 //Same goes for hot hot hot
17+
brutemod = 1.2 //Rattle me bones, but less because plasma bones are very hard
18+
siemens_coeff = 1.5 //Sparks are bad for the combustable race, mkay?
19+
punchdamagehigh = 7 //Bone punches are weak and usually inside soft suit gloves
20+
punchstunthreshold = 7 //Stuns on max hit as usual, somewhat higher stun chance because math
1821
payday_modifier = 0.8 //Useful to NT for plasma research
1922
breathid = "tox"
2023
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
Collapse file

‎code/modules/mob/living/carbon/human/species_types/podpeople.dm‎

Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/human/species_types/podpeople.dm
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ DISREGUARD THIS FILE IF YOU'RE INTENDING TO CHANGE ASPECTS OF PLAYER CONTROLLED
1414
attack_verb = "slash"
1515
attack_sound = 'sound/weapons/slice.ogg'
1616
miss_sound = 'sound/weapons/slashmiss.ogg'
17-
burnmod = 1.25
18-
heatmod = 1.5
17+
burnmod = 1.5 //Ow my plant
18+
heatmod = 1.5 //Ow my plant
19+
siemen_coeff = 0.75 //I wouldn't make semiconductors out of plant material
20+
punchdamagehigh = 8 //I am being attacked by a dandelion
21+
punchstunthreshold = 9 //TF2 no-crits special
1922
payday_modifier = 0.7 //Neutrally viewed by NT
2023
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
2124
disliked_food = MEAT | DAIRY | SEAFOOD
Collapse file

‎yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
coldmod = 1.5
1818
acidmod = 2
1919
speedmod = 0.33
20+
siemens_coeff = 0.75 //I wouldn't make semiconductors out of plant material
21+
punchdamagehigh = 8 //I am being attacked by a dandelion
22+
punchstunthreshold = 9 //TF2 no-crits special
23+
payday_modifier = 0.7 //Neutrally viewed by NT
2024
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
2125
disliked_food = MEAT | DAIRY
2226
liked_food = VEGETABLES | FRUIT | GRAIN
Collapse file

‎yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm‎

Copy file name to clipboardExpand all lines: yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ adjust_charge - take a positive or negative value to adjust the charge level
1616
attack_verb = "assault"
1717
meat = /obj/item/reagent_containers/food/snacks/meat/slab/synthmeat
1818
toxic_food = NONE
19-
brutemod = 1.25
20-
burnmod = 1.5
19+
brutemod = 1.25 //Have you ever punched a metal plate?
20+
burnmod = 1.5 //Computers don't like heat
21+
coldmod = 0.8 //Computers like cold, but their lungs may not
22+
heatmod = 1.75 //Again, computers don't like heat
23+
speedmod = 0.1 //Metal legs are heavy and slow
24+
punchstunthreshold = 9 //Stun range 9-10 on punch, you are being slugged in the brain by a metal robot fist.
25+
siemens_coeff = 1.75 //Computers REALLY don't like being shorted out
2126
payday_modifier = 0.8 //Useful to NT for engineering + very close to Human
2227
yogs_draw_robot_hair = TRUE
2328
mutanteyes = /obj/item/organ/eyes/preternis

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.