Skip to content

Commit

Permalink
Widow removal (Cosmic-Overlord#292)
Browse files Browse the repository at this point in the history
* widow removal

* Update castedatum_widow.dm

* Update HiveStatus.tsx

* hmm

* Update map_blips.dmi

* Update map_blips.dmi

* Update ai_behavior.dm

* hmmmmm

* Update map_blips.dmi

* Update map_blips.dmi

* Update map_blips.dmi
  • Loading branch information
Helg2 authored Jan 13, 2024
1 parent dca2085 commit 0724e07
Show file tree
Hide file tree
Showing 29 changed files with 46 additions and 29 deletions.
4 changes: 4 additions & 0 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@

#define COMSIG_XENOABILITY_SCATTER_SPIT "xenoability_scatter_spit"

/* RUTGMC DELETION, WIDOW DELETION
#define COMSIG_XENOABILITY_WEB_SPIT "xenoability_web_spit"
#define COMSIG_XENOABILITY_BURROW "xenoability_burrow"
#define COMSIG_XENOABILITY_LEASH_BALL "xenoability_leash_ball"
Expand All @@ -905,6 +906,7 @@
#define COMSIG_XENOABILITY_CANNIBALISE_SPIDERLING "xenoability_cannibalise_spiderling"
#define COMSIG_XENOABILITY_WEB_HOOK "xenoability_web_hook"
#define COMSIG_XENOABILITY_SPIDERLING_MARK "xenoability_spiderling_mark"
*/

#define COMSIG_XENOABILITY_PSYCHIC_SHIELD "xenoability_psychic_shield"
#define COMSIG_XENOABILITY_TRIGGER_PSYCHIC_SHIELD "xenoability_trigger_psychic_shield"
Expand Down Expand Up @@ -1046,11 +1048,13 @@
///Called from base of /datum/controller/subsystem/spatial_grid/proc/exit_cell: (/atom/movable)
#define SPATIAL_GRID_CELL_EXITED(contents_type) "spatial_grid_cell_exited_[contents_type]"

/* RUTGMC DELETION, WIDOW DELETION
// widow spiderling signals
#define COMSIG_SPIDERLING_MARK "spiderling_mark"
#define COMSIG_SPIDERLING_RETURN "spiderling_return"
#define COMSIG_SPIDERLING_GUARD "spiderling_guard"
#define COMSIG_SPIDERLING_UNGUARD "spiderling_unguard"
*/

//puppet
#define COMSIG_PUPPET_CHANGE_ORDER "puppetchangeorder"
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
#define isxenobull(A) (istype(A, /mob/living/carbon/xenomorph/bull))
#define isxenohivemind(A) (istype(A, /mob/living/carbon/xenomorph/hivemind))
#define isxenowraith(A) (istype(A, /mob/living/carbon/xenomorph/wraith))
#define isxenowidow(A) (istype(A, /mob/living/carbon/xenomorph/widow))
//#define isxenowidow(A) (istype(A, /mob/living/carbon/xenomorph/widow)) //RUTGMC DELETION, WIDOW DELETION
#define isxenowarlock(A) (istype(A, /mob/living/carbon/xenomorph/warlock))
#define isxenoking(A) (istype(A, /mob/living/carbon/xenomorph/king))
#define isxenobehemoth(A) (istype(A, /mob/living/carbon/xenomorph/behemoth))
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
//Larva defines
#define LARVA_VENT_CRAWL_TIME 1 SECONDS //Larva can crawl into vents fast

/* RUTGMC DELETION, WIDOW DELETION
//Widow Defines
#define WIDOW_SPEED_BONUS 1 // How much faster widow moves while she has wall_speedup element
#define WIDOW_WEB_HOOK_RANGE 10 // how far the web hook can reach
Expand All @@ -725,6 +726,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
//Spiderling defines
#define TIME_TO_DISSOLVE 5 SECONDS
#define SPIDERLING_RAGE_RANGE 10 // how close a nearby human has to be in order to be targeted
*/

//misc

Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
#define OPTABLE_TRAIT "optable"
#define TIMESHIFT_TRAIT "timeshift"
#define BRAIN_TRAIT "brain"
#define WIDOW_ABILITY_TRAIT "widow_ability_trait"
//#define WIDOW_ABILITY_TRAIT "widow_ability_trait" //RUTGMC DELETION, WIDOW DELETION
#define PSYCHIC_BLAST_ABILITY_TRAIT "psychic_blast_ability_trait"
#define PSYCHIC_CRUSH_ABILITY_TRAIT "psychic_crush_ability_trait"
#define VORTEX_ABILITY_TRAIT "vortex_ability_trait"
Expand Down
2 changes: 2 additions & 0 deletions code/datums/components/riding/riding_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
else if(riding_offsets["[RIDING_OFFSET_ALL]"])
. = riding_offsets["[RIDING_OFFSET_ALL]"]

/* RUTGMC DELETION, WIDOW DELETION
// ***************************************
// *********** Widow
// ***************************************
Expand Down Expand Up @@ -348,3 +349,4 @@
if(widow.stat == UNCONSCIOUS)
dir = SOUTH
return ..()
*/
2 changes: 2 additions & 0 deletions code/datums/keybinding/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,7 @@
keybind_signal = COMSIG_XENOABILITY_JAB
hotkey_keys = list("E")

/* RUTGMC DELETION, WIDOW DELETION
/datum/keybinding/xeno/burrow
name = "burrow"
full_name = "Widow: Burrow"
Expand Down Expand Up @@ -1010,6 +1011,7 @@
description = "Signal your spawn to a target they shall attack."
keybind_signal = COMSIG_XENOABILITY_SPIDERLING_MARK
hotkey_keys = list("V")
*/

/datum/keybinding/xeno/rewind
name = "rewind"
Expand Down
6 changes: 4 additions & 2 deletions code/modules/admin/topic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/boiler, location, null, delmob)
if("crusher")
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/crusher, location, null, delmob)
if("widow")
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/widow, location, null, delmob)
//if("widow") //RUTGMC DELETION, WIDOW DELETION
//newmob = M.change_mob_type(/mob/living/carbon/xenomorph/widow, location, null, delmob)
if("defiler")
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/defiler, location, null, delmob)
if("gorger")
Expand Down Expand Up @@ -479,6 +479,8 @@ Status: [status ? status : "Unknown"] | Damage: [health ? health : "None"]
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/facehugger, location, null, delmob)
if("panther")
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/panther, location, null, delmob)
if("chimera")
newmob = M.change_mob_type(/mob/living/carbon/xenomorph/chimera, location, null, delmob)
//RUTGMC EDIT END

C.holder.show_player_panel(newmob)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/ai/ai_behaviors/ai_behavior.dm
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ These are parameter based so the ai behavior can choose to (un)register the sign
if(!mob_parent?.canmove || mob_parent.do_actions)
return
/// This allows minions to be buckled to their atom_to_escort without disrupting the movement of atom_to_escort
if(get_dist(mob_parent, atom_to_walk_to) <= 0)
return
//if(get_dist(mob_parent, atom_to_walk_to) <= 0) // RUTGMC DELETION, WIDOW REMOVAL
//return
mob_parent.next_move_slowdown = 0
var/step_dir
if(get_dist(mob_parent, atom_to_walk_to) == distance_to_maintain)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

deevolves_to = /mob/living/carbon/xenomorph/drone

evolves_to = list(/mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/widow)
//evolves_to = list(/mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/widow) // RUTGMC DELETION, WIDOW DELETION, moved to modular

// *** Flags *** //
caste_flags = CASTE_EVOLUTION_ALLOWED
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
evolution_threshold = 225
//upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION

evolves_to = list(/mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/widow)
//evolves_to = list(/mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/widow) // RUTGMC DELETION, WIDOW DELETION, moved to the other file
deevolves_to = /mob/living/carbon/xenomorph/runner

// *** Flags *** //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//upgrade_threshold = TIER_TWO_THRESHOLD // RUTGMC DELETION
evolution_threshold = 225

evolves_to = list(/mob/living/carbon/xenomorph/widow, /mob/living/carbon/xenomorph/warlock)
//evolves_to = list(/mob/living/carbon/xenomorph/widow, /mob/living/carbon/xenomorph/warlock) // RUTGMC DELETION, WIDOW DELETION, moved to the other file
deevolves_to = list(/mob/living/carbon/xenomorph/defender)
caste_flags = CASTE_INNATE_PLASMA_REGEN|CASTE_PLASMADRAIN_IMMUNE|CASTE_EVOLUTION_ALLOWED
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_LEADER
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* RUTGMC DELETION, WIDOW REMOVAL
/datum/xeno_caste/spiderling
caste_name = "spiderling"
display_name = "spiderling"
Expand Down Expand Up @@ -35,3 +36,4 @@
actions = list(
/datum/action/ability/xeno_action/burrow,
)
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* RUTGMC DELETION, WIDOW REMOVAL
#define SPIDERLING_ATTEMPTING_GUARD "spiderling_attempting_guard"
#define SPIDERLING_NOT_GUARDING "spiderling_not_guarding"
#define SPIDERLING_GUARDING "spiderling_guarding"
Expand Down Expand Up @@ -272,3 +273,4 @@
SIGNAL_HANDLER
var/mob/living/carbon/xenomorph/spiderling/beno_to_coat = mob_parent
beno_to_coat?.apply_status_effect(STATUS_EFFECT_RESIN_JELLY_COATING)
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* RUTGMC DELETION, WIDOW REMOVAL
/datum/action/ability/activable/xeno/web_spit
name = "Web Spit"
desc = "Spit a web to your target, this causes different effects depending on where you hit. Spitting the head causes the target to be temporarily blind, body and arms will cause the target to be weakened, and legs will snare the target for a brief while."
Expand Down Expand Up @@ -474,3 +475,4 @@
/atom/movable/web_hook
name = "You can't see this"
invisibility = INVISIBILITY_ABSTRACT
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* RUTGMC DELETION, WIDOW REMOVAL
/datum/xeno_caste/widow
caste_name = "Widow"
display_name = "Widow"
Expand All @@ -23,7 +24,7 @@
max_health = 450
// *** Evolution *** //
//upgrade_threshold = TIER_THREE_THRESHOLD // RUTGMC DELETION
upgrade_threshold = TIER_THREE_THRESHOLD
deevolves_to = list(/mob/living/carbon/xenomorph/hunter, /mob/living/carbon/xenomorph/carrier, /mob/living/carbon/xenomorph/puppeteer)
Expand Down Expand Up @@ -92,3 +93,4 @@
/datum/action/ability/activable/xeno/spiderling_mark,
/datum/action/ability/activable/xeno/web_hook,
)
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* RUTGMC DELETION, WIDOW REMOVAL
/mob/living/carbon/xenomorph/widow
caste_base_type = /mob/living/carbon/xenomorph/widow
name = "Widow"
Expand Down Expand Up @@ -62,4 +63,4 @@
for(var/mob/living/carbon/xenomorph/spider AS in create_spiderling_action.spiderlings)
spider.revive(TRUE)
spider.forceMove(destination)

*/
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@

// *** Widow Abilities *** //
///maximum amount of spiderlings a widow can carry at one time.
var/max_spiderlings = 0
//var/max_spiderlings = 0 // RUTGMC DELETION, WIDOW DELETION

// *** Defender Abilities *** //
///modifying amount to the crest defense ability for defenders. Positive integers only.
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/xenoupgrade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -357,13 +357,15 @@
//----WRAITH END----//
//============//
//----WIDOW START----//
/* RUTGMC DELETION, WIDOW DELETION
/mob/living/carbon/xenomorph/widow
upgrade = XENO_UPGRADE_NORMAL
/mob/living/carbon/xenomorph/widow/primordial
upgrade = XENO_UPGRADE_PRIMO
//upgrade_stored = TIER_THREE_THRESHOLD
upgrade_stored = TIER_THREE_THRESHOLD
*/

//----WIDOW END----//
//============//
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/ammo_datums.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3971,6 +3971,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
/datum/ammo/xeno/hugger/acid
hugger_type = /obj/item/clothing/mask/facehugger/combat/acid

/* RUTGMC DELETION, WIDOW DELETION
/// For Widows Web Spit Ability
/datum/ammo/xeno/web
icon_state = "web_spit"
Expand Down Expand Up @@ -4043,6 +4044,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
/// This spawns a leash ball and checks if the turf is dense before doing so
/datum/ammo/xeno/leash_ball/proc/drop_leashball(turf/T)
new /obj/structure/xeno/aoe_leash(get_turf(T), hivenumber)
*/

/datum/ammo/xeno/spine //puppeteer
name = "spine"
Expand Down
2 changes: 0 additions & 2 deletions modular_RUtgmc/code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ GLOBAL_LIST_INIT(playable_icons, list(
"researcher",
"runner",
"sentinel",
"spiderling",
"spitter",
"st",
"staffofficer",
"synth",
"warlock",
"warrior",
"widow",
"wraith",
"xenoking",
"xenominion",
Expand Down
5 changes: 1 addition & 4 deletions modular_RUtgmc/code/_globalvars/lists/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
/mob/living/carbon/xenomorph/defiler/primordial,
/mob/living/carbon/xenomorph/crusher,
/mob/living/carbon/xenomorph/crusher/primordial,
/mob/living/carbon/xenomorph/widow,
/mob/living/carbon/xenomorph/widow/primordial,
/mob/living/carbon/xenomorph/shrike,
/mob/living/carbon/xenomorph/shrike/primordial,
/mob/living/carbon/xenomorph/warlock,
Expand All @@ -57,11 +55,10 @@ GLOBAL_LIST_INIT(all_xeno_types, list(
/mob/living/carbon/xenomorph/mantis,
/mob/living/carbon/xenomorph/scorpion,
/mob/living/carbon/xenomorph/facehugger,
/mob/living/carbon/xenomorph/spiderling,
))

GLOBAL_LIST_INIT(xeno_types_tier_two, list(/mob/living/carbon/xenomorph/hunter, /mob/living/carbon/xenomorph/panther, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/spitter, /mob/living/carbon/xenomorph/hivelord, /mob/living/carbon/xenomorph/carrier, /mob/living/carbon/xenomorph/bull, /mob/living/carbon/xenomorph/wraith, /mob/living/carbon/xenomorph/puppeteer))
GLOBAL_LIST_INIT(xeno_types_tier_three, list(/mob/living/carbon/xenomorph/gorger, /mob/living/carbon/xenomorph/widow, /mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/boiler, /mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/crusher, /mob/living/carbon/xenomorph/shrike, /mob/living/carbon/xenomorph/behemoth, /mob/living/carbon/xenomorph/chimera))
GLOBAL_LIST_INIT(xeno_types_tier_three, list(/mob/living/carbon/xenomorph/gorger, /mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/boiler, /mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/crusher, /mob/living/carbon/xenomorph/shrike, /mob/living/carbon/xenomorph/behemoth, /mob/living/carbon/xenomorph/chimera))

GLOBAL_LIST_INIT(forbid_excepts, list(
/mob/living/carbon/xenomorph/king,
Expand Down
2 changes: 1 addition & 1 deletion modular_RUtgmc/code/modules/admin/panels/player_panel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
<a href='?src=[ref];transform=puppeteer;mob=[REF(M)]'>Puppeteer</a> |
<br> Alien Tier 3:
<a href='?src=[ref];transform=ravager;mob=[REF(M)]'>Ravager</a> |
<a href='?src=[ref];transform=widow;mob=[REF(M)]'>Widow</a> |
<a href='?src=[ref];transform=praetorian;mob=[REF(M)]'>Praetorian</a> |
<a href='?src=[ref];transform=boiler;mob=[REF(M)]'>Boiler</a> |
<a href='?src=[ref];transform=defiler;mob=[REF(M)]'>Defiler</a> |
<a href='?src=[ref];transform=crusher;mob=[REF(M)]'>Crusher</a> |
<a href='?src=[ref];transform=gorger;mob=[REF(M)]'>Gorger</a> |
<a href='?src=[ref];transform=warlock;mob=[REF(M)]'>Warlock</a> |
<a href='?src=[ref];transform=behemoth;mob=[REF(M)]'>Behemoth</a> |
<a href='?src=[ref];transform=chimera;mob=[REF(M)]'>Chimera</a> |
<br> Alien Tier 4:
<a href='?src=[ref];transform=queen;mob=[REF(M)]'>Queen</a> |
<a href='?src=[ref];transform=shrike;mob=[REF(M)]'>Shrike</a> |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/datum/xeno_caste/carrier

// *** Flags *** //
evolves_to = list(/mob/living/carbon/xenomorph/defiler, /mob/living/carbon/xenomorph/gorger,)
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_JELLY

actions = list(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// *** Flags *** //
can_flags = CASTE_CAN_BE_QUEEN_HEALED|CASTE_CAN_BE_GIVEN_PLASMA|CASTE_CAN_BE_LEADER|CASTE_CAN_HOLD_FACEHUGGERS|CASTE_CAN_HOLD_JELLY

evolves_to = list(/mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/widow, /mob/living/carbon/xenomorph/chimera)
evolves_to = list(/mob/living/carbon/xenomorph/ravager, /mob/living/carbon/xenomorph/chimera)
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/datum/xeno_caste/puppeteer
evolves_to = list(/mob/living/carbon/xenomorph/gorger, /mob/living/carbon/xenomorph/warlock)

This file was deleted.

Binary file modified modular_RUtgmc/icons/UI_Icons/map_blips.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion modular_RUtgmc/includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
// #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\castedatum_predalien.dm"
// #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\predalien.dm"
// #include "code\modules\mob\living\carbon\xenomorph\castes\predalien\abilities_predalien.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\puppeteer\castedatum_puppeteer.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\queen\abilities_queen.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\queen\castedatum_queen.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\queen\queen.dm"
Expand All @@ -223,7 +224,6 @@
#include "code\modules\mob\living\carbon\xenomorph\castes\warlock\abilities_warlock.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\warrior\abilities_warrior.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\warrior\castedatum_warrior.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\widow\castedatum_widow.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\wraith\wraith.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\wraith\abilities_wraith.dm"
#include "code\modules\mob\living\carbon\xenomorph\castes\wraith\castedatum_wraith.dm"
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/HiveStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const HiveStatus = (_props, context) => {
theme="xeno"
title={hive_name + ' Hive Status'}
resizable
width={1200}
width={1000}
height={800}>
<Window.Content scrollable>
<CachedCollapsible
Expand Down

0 comments on commit 0724e07

Please sign in to comment.