Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kill Xenobio Stuff #3527

Merged
merged 9 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1028,14 +1028,10 @@
pixel_y = 32
},
/obj/structure/closet/secure_closet/freezer/wall/directional/west,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/condiment/enzyme{
pixel_x = -8;
pixel_y = 5
Expand Down
14 changes: 0 additions & 14 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -960,21 +960,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"pj" = (
/obj/structure/table/reinforced,
/obj/item/slime_extract/grey{
pixel_x = -4;
pixel_y = -1
},
/obj/item/slime_extract/grey{
pixel_x = 8
},
/obj/item/slime_extract/grey,
/obj/item/slime_extract/grey,
/obj/item/slime_extract/green{
pixel_x = 4;
pixel_y = -6
},
/obj/structure/window/reinforced,
/obj/item/slime_scanner,
/turf/open/floor/engine,
/area/ruin/rockplanet/nanotrasen)
"pl" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1850,8 +1850,8 @@
/obj/item/reagent_containers/food/drinks/waterbottle/empty,
/obj/item/reagent_containers/food/drinks/waterbottle/empty,
/obj/item/reagent_containers/food/drinks/waterbottle,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/item/reagent_containers/food/snacks/rationpack,
/obj/effect/spawner/lootdrop/ration,
/obj/effect/spawner/lootdrop/ration,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/reagent_containers/food/snacks/sosjerky,
/obj/item/stack/medical/gauze/improvised,
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1874,9 +1874,6 @@
/obj/structure/rack,
/obj/item/weldingtool/hugetank/empty,
/obj/item/clothing/mask/gas/welding,
/obj/item/slimepotion/slime/sentience/mining,
/obj/item/slimepotion/slime/sentience/mining,
/obj/item/slimepotion/slime/sentience/mining,
/obj/machinery/light/small/directional/east,
/obj/machinery/button/door{
dir = 4;
Expand Down
6 changes: 3 additions & 3 deletions check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ standards:

- exactly: [1, "/atom text paths", '"/atom']
- exactly: [1, "/area text paths", '"/area']
- exactly: [17, "/datum text paths", '"/datum']
- exactly: [16, "/datum text paths", '"/datum']
- exactly: [4, "/mob text paths", '"/mob']
- exactly: [36, "/obj text paths", '"/obj']
- exactly: [35, "/obj text paths", '"/obj']
- exactly: [0, "/turf text paths", '"/turf']
- exactly: [115, "text2path uses", "text2path"]
- exactly: [114, "text2path uses", "text2path"]

- exactly: [18, "world<< uses", 'world[ \t]*<<']
- exactly: [0, "world.log<< uses", 'world.log[ \t]*<<']
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
/// the default air mix that open turfs spawn
#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15"
#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15"
/// -193,15°C telecommunications. also used for xenobiology slime killrooms
/// -193,15°C telecommunications. good fluff for comms areas
#define TCOMMS_ATMOS "n2=100;TEMP=80"
/// space
#define AIRLESS_ATMOS "TEMP=2.7"
Expand Down
8 changes: 0 additions & 8 deletions code/__DEFINES/dcs/signals/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -678,14 +678,6 @@
#define COMSIG_ACTION_TRIGGER "action_trigger" //from base of datum/action/proc/Trigger(): (datum/action)
#define COMPONENT_ACTION_BLOCK_TRIGGER 1

//Xenobio hotkeys
#define COMSIG_XENO_SLIME_CLICK_CTRL "xeno_slime_click_ctrl" //from slime CtrlClickOn(): (/mob)
#define COMSIG_XENO_SLIME_CLICK_ALT "xeno_slime_click_alt" //from slime AltClickOn(): (/mob)
#define COMSIG_XENO_SLIME_CLICK_SHIFT "xeno_slime_click_shift" //from slime ShiftClickOn(): (/mob)
#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift" //from turf ShiftClickOn(): (/mob)
#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob)
#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob)

// /datum/overmap signals
/// From overmap Move(): (old_x, old_y)
#define COMSIG_OVERMAP_MOVED "overmap_moved"
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define HIDDEN_AREA (1<<6)
/// If false, loading multiple maps with this area type will create multiple instances.
#define UNIQUE_AREA (1<<7)
/// Can the Xenobio management console transverse this area by default?
#define XENOBIOLOGY_COMPATIBLE (1<<8)

/*
These defines are used specifically with the atom/pass_flags bitmask
Expand Down
9 changes: 0 additions & 9 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -335,15 +335,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
#define SYRINGE_DRAW 0
#define SYRINGE_INJECT 1

//gold slime core spawning
#define NO_SPAWN 0
#define HOSTILE_SPAWN 1
#define FRIENDLY_SPAWN 2

//slime core activation type
#define SLIME_ACTIVATE_MINOR 1
#define SLIME_ACTIVATE_MAJOR 2

#define LUMINESCENT_DEFAULT_GLOW 2

#define RIDING_OFFSET_ALL "ALL"
Expand Down
4 changes: 1 addition & 3 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -396,10 +396,8 @@
#define RACE_SWAP (1<<3)
//ERT spawn template (avoid races that don't function without correct gear)
#define ERT_SPAWN (1<<4)
//xenobio black crossbreed
#define SLIME_EXTRACT (1<<5)
//Wabbacjack staff projectiles
#define WABBAJACK (1<<6)
#define WABBAJACK (1<<5)

#define SLEEP_CHECK_DEATH(X) sleep(X); if(QDELETED(src) || stat == DEAD) return;

Expand Down
7 changes: 0 additions & 7 deletions code/__HELPERS/icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1028,13 +1028,6 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)

// Pick a random animal instead of the icon, and use that instead
/proc/getRandomAnimalImage(atom/A)
if(!GLOB.friendly_animal_types.len)
for(var/T in typesof(/mob/living/simple_animal))
var/mob/living/simple_animal/SA = T
if(initial(SA.gold_core_spawnable) == FRIENDLY_SPAWN)
GLOB.friendly_animal_types += SA


var/mob/living/simple_animal/SA = pick(GLOB.friendly_animal_types)

var/icon = initial(SA.icon)
Expand Down
22 changes: 0 additions & 22 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -482,28 +482,6 @@ GLOBAL_LIST_EMPTY(species_list)
else
to_chat(M, message)

//Used in chemical_mob_spawn. Generates a random mob based on a given gold_core_spawnable value.
/proc/create_random_mob(spawn_location, mob_class = HOSTILE_SPAWN)
var/static/list/mob_spawn_meancritters = list() // list of possible hostile mobs
var/static/list/mob_spawn_nicecritters = list() // and possible friendly mobs

if(mob_spawn_meancritters.len <= 0 || mob_spawn_nicecritters.len <= 0)
for(var/T in typesof(/mob/living/simple_animal))
var/mob/living/simple_animal/SA = T
switch(initial(SA.gold_core_spawnable))
if(HOSTILE_SPAWN)
mob_spawn_meancritters += T
if(FRIENDLY_SPAWN)
mob_spawn_nicecritters += T

var/chosen
if(mob_class == FRIENDLY_SPAWN)
chosen = pick(mob_spawn_nicecritters)
else
chosen = pick(mob_spawn_meancritters)
var/mob/living/simple_animal/C = new chosen(spawn_location)
return C

/proc/passtable_on(target, source)
var/mob/living/L = target
if (!HAS_TRAIT(L, TRAIT_PASSTABLE) && L.pass_flags & PASSTABLE)
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/bitfields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ DEFINE_BITFIELD(area_flags, list(
"NOTELEPORT" = NOTELEPORT,
"HIDDEN_AREA" = HIDDEN_AREA,
"UNIQUE_AREA" = UNIQUE_AREA,
"XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
))

DEFINE_BITFIELD(car_traits, list(
Expand Down
7 changes: 3 additions & 4 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,8 @@ GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons
25 Toxins
26 Dormitories
27 Virology
28 Xenobiology
29 Law Office
30 Detective's Office
28 Law Office
29 Detective's Office
*/

//The whole system for the sorttype var is determined based on the order of this list,
Expand All @@ -265,7 +264,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
"Robotics", "Head of Personnel's Office", "Library", "Chapel", "Theatre",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
"Experimentor Lab", "Toxins", "Dormitories", "Virology",
"Xenobiology", "Law Office","Detective's Office"))
, "Law Office","Detective's Office"))

GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt"))

Expand Down
107 changes: 0 additions & 107 deletions code/datums/components/dejavu.dm

This file was deleted.

11 changes: 0 additions & 11 deletions code/game/gamemodes/objective_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,6 @@
return TRUE
return FALSE

/datum/objective_item/steal/slime
name = "an unused sample of slime extract."
targetitem = /obj/item/slime_extract
difficulty = 3
excludefromjob = list("Research Director","Scientist")

/datum/objective_item/steal/slime/check_special_completion(obj/item/slime_extract/E)
if(E.Uses > 0)
return 1
return 0

/datum/objective_item/steal/blackbox
name = "The Blackbox."
targetitem = /obj/item/blackbox
Expand Down
15 changes: 0 additions & 15 deletions code/game/machinery/syndicatebomb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -410,14 +410,6 @@
for(var/obj/item/reagent_containers/glass/G in beakers)
reactants += G.reagents

for(var/obj/item/slime_extract/S in beakers)
if(S.Uses)
for(var/obj/item/reagent_containers/glass/G in beakers)
G.reagents.trans_to(S, G.reagents.total_volume)

if(S && S.reagents && S.reagents.total_volume)
reactants += S.reagents

if(!chem_splash(get_turf(src), spread_range, reactants, temp_boost))
playsound(loc, 'sound/items/screwdriver2.ogg', 50, TRUE)
return // The Explosion didn't do anything. No need to log, or disappear.
Expand Down Expand Up @@ -460,16 +452,9 @@
for(var/obj/item/grenade/chem_grenade/G in src)

if(istype(G, /obj/item/grenade/chem_grenade/large))
var/obj/item/grenade/chem_grenade/large/LG = G
max_beakers += 1 // Adding two large grenades only allows for a maximum of 7 beakers.
spread_range += 2 // Extra range, reduced density.
temp_boost += 50 // maximum of +150K blast using only large beakers. Not enough to self ignite.
for(var/obj/item/slime_extract/S in LG.beakers) // And slime cores.
if(beakers.len < max_beakers)
beakers += S
S.forceMove(src)
else
S.forceMove(drop_location())

if(istype(G, /obj/item/grenade/chem_grenade/cryo))
spread_range -= 1 // Reduced range, but increased density.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/anomalies/anomalies_bluespace.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
if(istype(A, /obj/item/beacon))
continue // don't teleport beacons because that's just insanely stupid
if(iscameramob(A))
continue // Don't mess with AI eye, xenobio or advanced cameras
continue // Don't mess with AI eye, or advanced cameras
if(A.anchored)
continue

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,6 @@
icon_state = "science"
build_path = /obj/machinery/computer/teleporter

/obj/item/circuitboard/computer/xenobiology
name = "circuit board (Xenobiology Console)"
icon_state = "science"
build_path = /obj/machinery/computer/camera_advanced/xenobio

//Security

/obj/item/circuitboard/computer/gulag_teleporter_console
Expand Down
Loading
Loading