cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Fixes-Integration-Tests

Browse Source
This commit is contained in:
BurgerLUA
2023-07-22 15:12:36 -07:00
committed by GitHub
parent 921df9c9f6 4b0bf938b7
commit 1f28cc2f47
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/_species.dm
View File

@@ -116,7 +116,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
///multiplier for stun durations ///multiplier for stun durations
var/stunmod = 1 var/stunmod = 1
///multiplier for money paid at payday ///multiplier for money paid at payday
var/payday_modifier = 1 var/payday_modifier = 0.75 // BUBBER DUMB SHIT REMOVAL
///Base electrocution coefficient. Basically a multiplier for damage from electrocutions. ///Base electrocution coefficient. Basically a multiplier for damage from electrocutions.
var/siemens_coeff = 1 var/siemens_coeff = 1
///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA. ///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA.

2
code/modules/mob/living/carbon/human/species_types/humans.dm
View File

@@ -8,7 +8,7 @@
mutant_bodyparts = list("wings" = "None") mutant_bodyparts = list("wings" = "None")
skinned_type = /obj/item/stack/sheet/animalhide/human skinned_type = /obj/item/stack/sheet/animalhide/human
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
payday_modifier = 1 // payday_modifier = 1 // BUBBER DUMB SHIT REMOVAL
/datum/species/human/prepare_human_for_preview(mob/living/carbon/human/human) /datum/species/human/prepare_human_for_preview(mob/living/carbon/human/human)
human.set_haircolor("#bb9966", update = FALSE) // brown human.set_haircolor("#bb9966", update = FALSE) // brown

2
code/modules/mob/living/carbon/human/species_types/monkeys.dm
View File

@@ -37,7 +37,7 @@
dust_anim = "dust-m" dust_anim = "dust-m"
gib_anim = "gibbed-m" gib_anim = "gibbed-m"
payday_modifier = 1.5 // payday_modifier = 1.5 BUBBER DUMB SHIT REMOVAL
ai_controlled_species = TRUE ai_controlled_species = TRUE

4
html/changelogs/AutoChangeLog-pr-375.yml Normal file
View File

@@ -0,0 +1,4 @@
author: "nevimer"
delete-after: True
changes:
- balance: "soft removed the payday modifier"

4
html/changelogs/AutoChangeLog-pr-379.yml Normal file
View File

@@ -0,0 +1,4 @@
author: "Icarus-The-Sun"
delete-after: True
changes:
- qol: "Returns hemophage mutant Colors"

2
modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm
View File

@@ -72,7 +72,7 @@
TRAIT_CAN_USE_FLIGHT_POTION, TRAIT_CAN_USE_FLIGHT_POTION,
TRAIT_LITERATE, TRAIT_LITERATE,
TRAIT_DRINKS_BLOOD, TRAIT_DRINKS_BLOOD,
TRAIT_USES_SKINTONES, TRAIT_MUTANT_COLORS,
) )
inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC
default_mutant_bodyparts = list( default_mutant_bodyparts = list(