Skip to content
This repository was archived by the owner on Jun 18, 2022. It is now read-only.

[DNM] defines #3

Open
AllCorruptingWyrm wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[DNM] defines #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
582078c
defines
AllCorruptingWyrm Apr 27, 2022
6604e91
adds in sm/ghoul defines
AllCorruptingWyrm Apr 27, 2022
545c274
CI trigger
hermaplusplus Apr 28, 2022
0ceeade
CI trigger #2
hermaplusplus Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@
#define HEAT_MOBIGNITE_THRESHOLD 530 //minimum amount of heat an object needs to ignite a mob when it hits the mob

#define SPECIES_HUMAN "Human"
#define SPECIES_GHOUL "Ghoul"
#define SPECIES_MUTANT "Super Mutant"

#define RANDOM_BLOOD_TYPE pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")

Expand Down
12 changes: 6 additions & 6 deletions code/__DEFINES/perks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#define PERK_DRUG_ADDICT /datum/perk/fate/drug_addict
#define PERK_NOBLE /datum/perk/fate/noble
#define PERK_RAT /datum/perk/fate/rat
#define PERK_REJECTED_GENIUS /datum/perk/fate/rejected_genius
#define PERK_OBORIN_SYNDROME /datum/perk/fate/oborin_syndrome
#define PERK_LOWBORN /datum/perk/fate/lowborn
/*#define PERK_REJECTED_GENIUS /datum/perk/fate/rejected_genius*/
/*#define PERK_OBORIN_SYNDROME /datum/perk/fate/oborin_syndrome*/
/*#define PERK_LOWBORN /datum/perk/fate/lowborn */

// oddity perks
#define PERK_FAST_WALKER /datum/perk/oddity/fast_walker
Expand All @@ -24,17 +24,17 @@
#define PERK_CHARMING_PERSONALITY /datum/perk/oddity/charming_personality
#define PERK_HORRIBLE_DEEDS /datum/perk/oddity/horrible_deeds
#define PERK_CHAINGUN_SMOKER /datum/perk/oddity/chaingun_smoker
#define PERK_NIGHTCRAWLER /datum/perk/oddity/nightcrawler
/*#define PERK_NIGHTCRAWLER /datum/perk/oddity/nightcrawler*/
#define PERK_FAST_FINGERS /datum/perk/oddity/fast_fingers
#define PERK_QUIET_AS_MOUSE /datum/perk/oddity/quiet_as_mouse
#define PERK_EAR_OF_QUICKSILVER /datum/perk/oddity/ear_of_quicksilver
#define PERK_BALLS_OF_PLASTEEL /datum/perk/oddity/balls_of_plasteel
#define PERK_JUNKBORN /datum/perk/oddity/junkborn
#define PERK_ASS_OF_CONCRETE /datum/perk/oddity/ass_of_concrete
#define PERK_TOXIC_REVENGER /datum/perk/oddity/toxic_revenger
/*#define PERK_TOXIC_REVENGER /datum/perk/oddity/toxic_revenger*/
#define PERK_ABSOLUTE_GRAB /datum/perk/oddity/absolute_grab
#define PERK_SURE_STEP /datum/perk/oddity/sure_step
#define PERK_MARKET_PROF /datum/perk/oddity/market_prof
#define PERK_MARKET_PROF /datum/perk/market_prof

// NT perks
#define PERK_HOLY_LIGHT /datum/perk/nt_oddity/holy_light
Expand Down