[MIRROR] Adds the Ancient Cloning Lab ruin (#5814)
* Adds the Ancient Cloning Lab ruin * fixes conflicts
This commit is contained in:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
032511a03e
commit
766b85908e
+12
-13
@@ -82,19 +82,18 @@
|
||||
#define NOBLOOD 6
|
||||
#define NOTRANSSTING 7
|
||||
#define MUTCOLORS_PARTSONLY 8 //Used if we want the mutant colour to be only used by mutant bodyparts. Don't combine this with MUTCOLORS, or it will be useless.
|
||||
#define NOCRITDAMAGE 9
|
||||
#define NOZOMBIE 10
|
||||
#define DIGITIGRADE 11 //Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
|
||||
#define NO_UNDERWEAR 12
|
||||
#define NOLIVER 13
|
||||
#define NOSTOMACH 14
|
||||
#define NO_DNA_COPY 15
|
||||
#define DRINKSBLOOD 16
|
||||
#define SPECIES_ORGANIC 17
|
||||
#define SPECIES_INORGANIC 18
|
||||
#define SPECIES_UNDEAD 19
|
||||
#define SPECIES_ROBOTIC 20
|
||||
#define NOEYES 21
|
||||
#define NOZOMBIE 9
|
||||
#define DIGITIGRADE 10 //Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
|
||||
#define NO_UNDERWEAR 11
|
||||
#define NOLIVER 12
|
||||
#define NOSTOMACH 13
|
||||
#define NO_DNA_COPY 14
|
||||
#define DRINKSBLOOD 15
|
||||
#define SPECIES_ORGANIC 16
|
||||
#define SPECIES_INORGANIC 17
|
||||
#define SPECIES_UNDEAD 18
|
||||
#define SPECIES_ROBOTIC 19
|
||||
#define NOEYES 20
|
||||
|
||||
#define ORGAN_SLOT_BRAIN "brain"
|
||||
#define ORGAN_SLOT_APPENDIX "appendix"
|
||||
|
||||
+55
-55
@@ -1,55 +1,55 @@
|
||||
// Radios use a large variety of predefined frequencies.
|
||||
|
||||
#define MIN_FREE_FREQ 1201 // -------------------------------------------------
|
||||
// Frequencies are always odd numbers and range from 1201 to 1599.
|
||||
|
||||
#define FREQ_SYNDICATE 1213 // Nuke op comms frequency, dark brown
|
||||
#define FREQ_CTF_RED 1215 // CTF red team comms frequency, red
|
||||
#define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue
|
||||
#define FREQ_CENTCOM 1337 // CentCom comms frequency, gray
|
||||
#define FREQ_SUPPLY 1347 // Supply comms frequency, light brown
|
||||
#define FREQ_SERVICE 1349 // Service comms frequency, green
|
||||
#define FREQ_SCIENCE 1351 // Science comms frequency, plum
|
||||
#define FREQ_COMMAND 1353 // Command comms frequency, gold
|
||||
#define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue
|
||||
#define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange
|
||||
#define FREQ_SECURITY 1359 // Security comms frequency, red
|
||||
|
||||
#define FREQ_STATUS_DISPLAYS 1435
|
||||
#define FREQ_ATMOS_ALARMS 1437 // air alarms <-> alert computers
|
||||
#define FREQ_ATMOS_CONTROL 1439 // air alarms <-> vents and scrubbers
|
||||
|
||||
#define MIN_FREQ 1441 // ------------------------------------------------------
|
||||
// Only the 1441 to 1489 range is freely available for general conversation.
|
||||
// This represents 1/8th of the available spectrum.
|
||||
|
||||
#define FREQ_ATMOS_STORAGE 1441
|
||||
#define FREQ_NAV_BEACON 1445
|
||||
#define FREQ_AI_PRIVATE 1447 // AI private comms frequency, magenta
|
||||
#define FREQ_PRESSURE_PLATE 1447
|
||||
#define FREQ_AIRLOCK_CONTROL 1449
|
||||
#define FREQ_ELECTROPACK 1449
|
||||
#define FREQ_MAGNETS 1449
|
||||
#define FREQ_LOCATOR_IMPLANT 1451
|
||||
#define FREQ_SIGNALER 1457 // the default for new signalers
|
||||
#define FREQ_COMMON 1459 // Common comms frequency, dark green
|
||||
|
||||
#define MAX_FREQ 1489 // ------------------------------------------------------
|
||||
|
||||
#define MAX_FREE_FREQ 1599 // -------------------------------------------------
|
||||
|
||||
// Transmission types.
|
||||
#define TRANSMISSION_WIRE 0 // some sort of wired connection, not used
|
||||
#define TRANSMISSION_RADIO 1 // electromagnetic radiation (default)
|
||||
#define TRANSMISSION_SUBSPACE 2 // subspace transmission (headsets only)
|
||||
#define TRANSMISSION_SUPERSPACE 3 // reaches independent (CentCom) radios only
|
||||
|
||||
// Filter types, used as an optimization to avoid unnecessary proc calls.
|
||||
#define RADIO_TO_AIRALARM "to_airalarm"
|
||||
#define RADIO_FROM_AIRALARM "from_airalarm"
|
||||
#define RADIO_SIGNALER "signaler"
|
||||
#define RADIO_ATMOSIA "atmosia"
|
||||
#define RADIO_AIRLOCK "airlock"
|
||||
#define RADIO_MAGNETS "magnets"
|
||||
|
||||
#define DEFAULT_SIGNALER_CODE 30
|
||||
// Radios use a large variety of predefined frequencies.
|
||||
|
||||
#define MIN_FREE_FREQ 1201 // -------------------------------------------------
|
||||
// Frequencies are always odd numbers and range from 1201 to 1599.
|
||||
|
||||
#define FREQ_SYNDICATE 1213 // Nuke op comms frequency, dark brown
|
||||
#define FREQ_CTF_RED 1215 // CTF red team comms frequency, red
|
||||
#define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue
|
||||
#define FREQ_CENTCOM 1337 // CentCom comms frequency, gray
|
||||
#define FREQ_SUPPLY 1347 // Supply comms frequency, light brown
|
||||
#define FREQ_SERVICE 1349 // Service comms frequency, green
|
||||
#define FREQ_SCIENCE 1351 // Science comms frequency, plum
|
||||
#define FREQ_COMMAND 1353 // Command comms frequency, gold
|
||||
#define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue
|
||||
#define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange
|
||||
#define FREQ_SECURITY 1359 // Security comms frequency, red
|
||||
|
||||
#define FREQ_STATUS_DISPLAYS 1435
|
||||
#define FREQ_ATMOS_ALARMS 1437 // air alarms <-> alert computers
|
||||
#define FREQ_ATMOS_CONTROL 1439 // air alarms <-> vents and scrubbers
|
||||
|
||||
#define MIN_FREQ 1441 // ------------------------------------------------------
|
||||
// Only the 1441 to 1489 range is freely available for general conversation.
|
||||
// This represents 1/8th of the available spectrum.
|
||||
|
||||
#define FREQ_ATMOS_STORAGE 1441
|
||||
#define FREQ_NAV_BEACON 1445
|
||||
#define FREQ_AI_PRIVATE 1447 // AI private comms frequency, magenta
|
||||
#define FREQ_PRESSURE_PLATE 1447
|
||||
#define FREQ_AIRLOCK_CONTROL 1449
|
||||
#define FREQ_ELECTROPACK 1449
|
||||
#define FREQ_MAGNETS 1449
|
||||
#define FREQ_LOCATOR_IMPLANT 1451
|
||||
#define FREQ_SIGNALER 1457 // the default for new signalers
|
||||
#define FREQ_COMMON 1459 // Common comms frequency, dark green
|
||||
|
||||
#define MAX_FREQ 1489 // ------------------------------------------------------
|
||||
|
||||
#define MAX_FREE_FREQ 1599 // -------------------------------------------------
|
||||
|
||||
// Transmission types.
|
||||
#define TRANSMISSION_WIRE 0 // some sort of wired connection, not used
|
||||
#define TRANSMISSION_RADIO 1 // electromagnetic radiation (default)
|
||||
#define TRANSMISSION_SUBSPACE 2 // subspace transmission (headsets only)
|
||||
#define TRANSMISSION_SUPERSPACE 3 // reaches independent (CentCom) radios only
|
||||
|
||||
// Filter types, used as an optimization to avoid unnecessary proc calls.
|
||||
#define RADIO_TO_AIRALARM "to_airalarm"
|
||||
#define RADIO_FROM_AIRALARM "from_airalarm"
|
||||
#define RADIO_SIGNALER "signaler"
|
||||
#define RADIO_ATMOSIA "atmosia"
|
||||
#define RADIO_AIRLOCK "airlock"
|
||||
#define RADIO_MAGNETS "magnets"
|
||||
|
||||
#define DEFAULT_SIGNALER_CODE 30
|
||||
|
||||
+30
-30
@@ -1,30 +1,30 @@
|
||||
#define SEE_INVISIBLE_MINIMUM 5
|
||||
|
||||
#define INVISIBILITY_LIGHTING 20
|
||||
|
||||
#define SEE_INVISIBLE_LIVING 25
|
||||
|
||||
//#define SEE_INVISIBLE_LEVEL_ONE 35 //currently unused
|
||||
//#define INVISIBILITY_LEVEL_ONE 35 //currently unused
|
||||
|
||||
//#define SEE_INVISIBLE_LEVEL_TWO 45 //currently unused
|
||||
//#define INVISIBILITY_LEVEL_TWO 45 //currently unused
|
||||
|
||||
#define INVISIBILITY_OBSERVER 60
|
||||
#define SEE_INVISIBLE_OBSERVER 60
|
||||
|
||||
#define INVISIBILITY_MAXIMUM 100 //the maximum allowed for "real" objects
|
||||
|
||||
#define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.
|
||||
|
||||
#define BORGMESON 1
|
||||
#define BORGTHERM 2
|
||||
#define BORGXRAY 4
|
||||
#define BORGMATERIAL 8
|
||||
|
||||
//for clothing visor toggles, these determine which vars to toggle
|
||||
#define VISOR_FLASHPROTECT 1
|
||||
#define VISOR_TINT 2
|
||||
#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses
|
||||
#define VISOR_DARKNESSVIEW 8
|
||||
#define VISOR_INVISVIEW 16
|
||||
#define SEE_INVISIBLE_MINIMUM 5
|
||||
|
||||
#define INVISIBILITY_LIGHTING 20
|
||||
|
||||
#define SEE_INVISIBLE_LIVING 25
|
||||
|
||||
//#define SEE_INVISIBLE_LEVEL_ONE 35 //currently unused
|
||||
//#define INVISIBILITY_LEVEL_ONE 35 //currently unused
|
||||
|
||||
//#define SEE_INVISIBLE_LEVEL_TWO 45 //currently unused
|
||||
//#define INVISIBILITY_LEVEL_TWO 45 //currently unused
|
||||
|
||||
#define INVISIBILITY_OBSERVER 60
|
||||
#define SEE_INVISIBLE_OBSERVER 60
|
||||
|
||||
#define INVISIBILITY_MAXIMUM 100 //the maximum allowed for "real" objects
|
||||
|
||||
#define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.
|
||||
|
||||
#define BORGMESON 1
|
||||
#define BORGTHERM 2
|
||||
#define BORGXRAY 4
|
||||
#define BORGMATERIAL 8
|
||||
|
||||
//for clothing visor toggles, these determine which vars to toggle
|
||||
#define VISOR_FLASHPROTECT 1
|
||||
#define VISOR_TINT 2
|
||||
#define VISOR_VISIONFLAGS 4 //all following flags only matter for glasses
|
||||
#define VISOR_DARKNESSVIEW 8
|
||||
#define VISOR_INVISVIEW 16
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
#define TRAIT_SLEEPIMMUNE "sleep_immunity"
|
||||
#define TRAIT_PUSHIMMUNE "push_immunity"
|
||||
#define TRAIT_SHOCKIMMUNE "shock_immunity"
|
||||
#define TRAIT_STABLEHEART "stable_heart"
|
||||
#define TRAIT_RESISTHEAT "resist_heat"
|
||||
#define TRAIT_RESISTCOLD "resist_cold"
|
||||
#define TRAIT_RESISTHIGHPRESSURE "resist_high_pressure"
|
||||
@@ -38,6 +39,7 @@
|
||||
#define TRAIT_NOBREATH "no_breath"
|
||||
#define TRAIT_ANTIMAGIC "anti_magic"
|
||||
#define TRAIT_HOLY "holy"
|
||||
#define TRAIT_NOCRITDAMAGE "no_crit"
|
||||
|
||||
#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"
|
||||
#define TRAIT_AGEUSIA "ageusia"
|
||||
@@ -71,4 +73,4 @@
|
||||
#define TRAIT_HULK "hulk"
|
||||
#define STASIS_MUTE "stasis"
|
||||
#define GENETICS_SPELL "genetics_spell"
|
||||
#define EYES_COVERED "eyes_covered"
|
||||
#define EYES_COVERED "eyes_covered"
|
||||
|
||||
Reference in New Issue
Block a user