Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 341f960

Browse files
authored
Deletes shadowling + Reworks darkspawn (#20581)
1 parent bb7dde6 commit 341f960

225 files changed

Lines changed: 7744 additions & 4504 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_maps/shuttles/ferry_meat.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
name = "podperson meat"
6767
},
6868
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow{
69-
name = "shadowling meat"
69+
name = "nightmare meat"
7070
},
7171
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime{
7272
name = "slimeperson meat"

code/__DEFINES/DNA.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
#define ORGAN_SLOT_LUNGS "lungs"
198198
#define ORGAN_SLOT_HEART "heart"
199199
#define ORGAN_SLOT_ZOMBIE "zombie_infection"
200+
#define ORGAN_SLOT_BRAIN_TUMOR "brain_tumor"
200201
#define ORGAN_SLOT_LIVER "liver"
201202
#define ORGAN_SLOT_TONGUE "tongue"
202203
#define ORGAN_SLOT_VOICE "vocal_cords"

code/__DEFINES/colors.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312

313313
#define COLOR_CHANGELING_CHEMICALS "#DD66DD"
314314
#define COLOR_DARKSPAWN_PSI "#7264FF"
315+
#define COLOR_VELVET "#21007F"
315316

316317
#define COLOR_CARP_PURPLE "#aba2ff"
317318
#define COLOR_CARP_PINK "#da77a8"

code/__DEFINES/dcs/signals/signals_global.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,5 @@
8282
#define COMSIG_NARSIE_SUMMON_UPDATE "!narsie_summon_update"
8383
/// Global signal when starlight color is changed (old_star, new_star)
8484
#define COMSIG_STARLIGHT_COLOR_CHANGED "!starlight_color_changed"
85+
/// Global signal sent when darkspawns ascend: (No arguments)
86+
#define COMSIG_DARKSPAWN_ASCENSION "!darkspawn_ascension"

code/__DEFINES/dcs/signals/signals_mob/signals_living.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
#define COMSIG_LIVING_STATUS_PARALYZE "living_paralyze"
7373
///from base of mob/living/Immobilize() (amount, ignore_canstun)
7474
#define COMSIG_LIVING_STATUS_IMMOBILIZE "living_immobilize"
75+
///from base of mob/living/Daze() (amount, ignore_canstun)
76+
#define COMSIG_LIVING_STATUS_DAZE "living_daze"
7577
///from base of mob/living/Unconscious() (amount, ignore_canstun)
7678
#define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious"
7779
///from base of mob/living/Sleeping() (amount, ignore_canstun)

code/__DEFINES/dcs/signals/signals_object.dm

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,3 +459,19 @@
459459

460460
/// from /obj/item/detective_scanner/scan(): (mob/user, list/extra_data)
461461
#define COMSIG_DETECTIVE_SCANNED "det_scanned"
462+
463+
// /datum/element/light_eater
464+
///from base of [/datum/element/light_eater/proc/table_buffet]: (list/light_queue, datum/light_eater)
465+
#define COMSIG_LIGHT_EATER_QUEUE "light_eater_queue"
466+
///from base of [/datum/element/light_eater/proc/devour]: (datum/light_eater)
467+
#define COMSIG_LIGHT_EATER_ACT "light_eater_act"
468+
///Prevents the default light eater behavior from running in case of immunity or custom behavior
469+
#define COMPONENT_BLOCK_LIGHT_EATER (1<<0)
470+
///from base of [/datum/element/light_eater/proc/devour]: (atom/eaten_light)
471+
#define COMSIG_LIGHT_EATER_DEVOUR "light_eater_devour"
472+
473+
474+
/// Flag for when /afterattack potentially acts on an item.
475+
/// Used for the swap hands/drop tutorials to know when you might just be trying to do something normally.
476+
/// Does not necessarily imply success, or even that it did hit an item, just intent.
477+
#define COMPONENT_AFTERATTACK_PROCESSED_ITEM (1<<0)

code/__DEFINES/is_helpers.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#define isnan(x) ( isnum((x)) && ((x) != (x)) )
1717

18-
#define isinternalorgan(A) (istype(A, /obj/item/organ/internal))
18+
//#define isinternalorgan(A) (istype(A, /obj/item/organ/internal)) uncomment if we port tg organ code
1919

2020
//Turfs
2121
//#define isturf(A) (istype(A, /turf)) This is actually a byond built-in. Added here for completeness sake.
@@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
9393
#define isinsurgent(A) (is_species(A, /datum/species/ipc/self/insurgent))
9494
#define issnail(A) (is_species(A, /datum/species/snail))
9595
#define isandroid(A) (is_species(A, /datum/species/android))
96+
#define isshadowperson(A) (is_species(A, /datum/species/shadow))
9697
#define is_synth(A) (is_species(A,/datum/species/wy_synth))
9798
#define isdummy(A) (istype(A, /mob/living/carbon/human/dummy))
9899

code/__DEFINES/magic.dm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#define SPELL_REQUIRES_MIND (1 << 6)
6161
/// Whether the spell requires the caster have a mime vow (mindless mobs will succeed this check regardless).
6262
#define SPELL_REQUIRES_MIME_VOW (1 << 7)
63+
6364
/// Whether the spell can be cast, even if the caster is unable to speak the invocation
6465
/// (effectively making the invocation flavor, instead of required).
6566
#define SPELL_CASTABLE_WITHOUT_INVOCATION (1 << 8)
@@ -87,7 +88,7 @@ DEFINE_BITFIELD(spell_requirements, list(
8788
// Bitflags for magic resistance types
8889
/// Default magic resistance that blocks normal magic (wizard, spells, magical staff projectiles)
8990
#define MAGIC_RESISTANCE (1<<0)
90-
/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses, abductors)
91+
/// Tinfoil hat magic resistance that blocks mental magic (telepathy / mind links, mind curses, abductors, darkspawns)
9192
#define MAGIC_RESISTANCE_MIND (1<<1)
9293
/// Holy magic resistance that blocks unholy magic (revenant, vampire, voice of god)
9394
#define MAGIC_RESISTANCE_HOLY (1<<2)

code/__DEFINES/maths.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@
189189
while(pixel_y < -16)
190190
pixel_y += 32
191191
new_y--
192-
new_x = clamp(new_x, 0, world.maxx)
193-
new_y = clamp(new_y, 0, world.maxy)
192+
new_x = clamp(new_x, 1, world.maxx)
193+
new_y = clamp(new_y, 1, world.maxy)
194194
return locate(new_x, new_y, starting.z)
195195

196196
// Returns a list where [1] is all x values and [2] is all y values that overlap between the given pair of rectangles

code/__DEFINES/mobs.dm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,10 @@
281281

282282
#define MEGAFAUNA_DEFAULT_RECOVERY_TIME 5
283283

284-
#define SHADOW_SPECIES_LIGHT_THRESHOLD 0.2
284+
#define SHADOW_SPECIES_DIM_LIGHT 0.2 //light of this intensity suppresses healing and causes very slow burn damage
285+
#define SHADOW_SPECIES_BRIGHT_LIGHT 0.6 //light of this intensity causes rapid burn damage (high number because movable lights are weird)
286+
//so the problem is that movable lights ALWAYS have a luminosity of 0.5, regardless of power or distance, so even at the edge of the overlay they still do damage
287+
//at 0.6 being bright they'll still do damage and disable some abilities, but it won't be weaponized
285288

286289
// Offsets defines
287290

0 commit comments

Comments
 (0)