From 582078c00c8ebf6095dab44cd1308cade0328869 Mon Sep 17 00:00:00 2001 From: All Corrupting Wyrm Date: Wed, 27 Apr 2022 18:24:10 -0400 Subject: [PATCH 1/4] defines finishes it --- code/__DEFINES/perks.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/perks.dm b/code/__DEFINES/perks.dm index cf39856f85..82b7baec92 100644 --- a/code/__DEFINES/perks.dm +++ b/code/__DEFINES/perks.dm @@ -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 @@ -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 From 6604e9158146b684255d717e937c2ffbd22bbe8c Mon Sep 17 00:00:00 2001 From: All Corrupting Wyrm Date: Wed, 27 Apr 2022 18:28:15 -0400 Subject: [PATCH 2/4] adds in sm/ghoul defines ditto --- code/__DEFINES/mobs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 39f40e70d6..89bba7024b 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -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+") From 545c2742d6edef1f7f39da6ad4b8deff7be5866d Mon Sep 17 00:00:00 2001 From: hermaplusplus <49307226+hermaplusplus@users.noreply.github.com> Date: Thu, 28 Apr 2022 03:48:37 +0100 Subject: [PATCH 3/4] CI trigger From 0ceeade366994d1eb5119e8ece7a8564a05c7b5c Mon Sep 17 00:00:00 2001 From: hermaplusplus <49307226+hermaplusplus@users.noreply.github.com> Date: Thu, 28 Apr 2022 03:55:39 +0100 Subject: [PATCH 4/4] CI trigger #2