Skip to content

Commit

Permalink
joskofixim
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xackii
Xackii committed Feb 7, 2024
1 parent e009197 commit e6591bf
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 42 deletions.
5 changes: 0 additions & 5 deletions code/__DEFINES/traits/declarations.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1064,9 +1064,4 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Trait applied to objects and mobs that can attack a boulder and break it down. (See /obj/item/boulder/manual_process())
#define TRAIT_BOULDER_BREAKER "boulder_breaker"

#define NANITES_TRAIT "nanites" // Massmeta editchen

/// The mob's nanites are sending a monitoring signal visible on diag HUD // Massmeta editchen
#define TRAIT_NANITE_MONITORING "nanite_monitoring"

// END TRAIT DEFINES
2 changes: 0 additions & 2 deletions code/__DEFINES/~massmeta_defines/_defines_include.dm
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
#include "inventory.dm"
#include "nanites_defines.dm"
#include "nanites_signals.dm"
6 changes: 6 additions & 0 deletions code/__DEFINES/~massmeta_defines/nanites_defines.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,9 @@

//_Defines/mobs
#define VOMIT_NANITE (1<<6)

//_Defines/traits/declarations
#define NANITES_TRAIT "nanites"

/// The mob's nanites are sending a monitoring signal visible on diag HUD // Massmeta editchen
#define TRAIT_NANITE_MONITORING "nanite_monitoring"
4 changes: 2 additions & 2 deletions code/game/machinery/computer/crew.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
return data_by_z["[z]"]

var/list/results = list()
for(var/tracked_mob in GLOB.suit_sensors_list | GLOB.nanite_sensors_list)
for(var/tracked_mob in GLOB.suit_sensors_list | GLOB.nanite_sensors_list) //massmeta edit
if(!tracked_mob)
stack_trace("Null entry in suit sensors list.")
continue
Expand All @@ -211,7 +211,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
var/sensor_mode

// Set sensor level based on whether we're in the nanites list or the suit sensor list.
if(tracked_living_mob in GLOB.nanite_sensors_list)
if(tracked_living_mob in GLOB.nanite_sensors_list) //massmeta edit
sensor_mode = SENSOR_COORDS
else
var/mob/living/carbon/human/tracked_human = tracked_living_mob
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/pinpointer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
var/turf/here = get_turf(src)
var/turf/there = get_turf(H)
if(here && there && (there.z == here.z || (is_station_level(here.z) && is_station_level(there.z)))) // Device and target should be on the same level or different levels of the same station
if (H in GLOB.nanite_sensors_list)
if (H in GLOB.nanite_sensors_list) //massmeta edit
return TRUE
if (istype(H.w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/U = H.w_uniform
Expand Down
Binary file modified icons/mob/huds/hud.dmi
View file
Binary file not shown.
33 changes: 33 additions & 0 deletions massmeta/includes.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,36 @@
#include "features\hardsuits\code\hardsuit.dm"
#include "features\hardsuits\code\helmet.dm"
#include "features\hardsuits\code\space_suit_beacon.dm"
//nanits
#include "code\datums\nanits\nanite_designs.dm"
#include "code\datums\nanits\nanite_mood.dm"
#include "code\datums\nanits\nanites_circuitboard.dm"
#include "code\datums\nanits\nanites_component.dm"
#include "code\datums\nanits\nanites_hud.dm"
#include "code\datums\nanits\nanites_processing.dm"
#include "code\datums\nanits\nanites_techweb.dm"
#include "code\datums\nanits\nanites_research\nanite_chamber.dm"
#include "code\datums\nanits\nanites_research\nanite_chamber_computer.dm"
#include "code\datums\nanits\nanites_research\nanite_cloud_controller.dm"
#include "code\datums\nanits\nanites_research\nanite_injector.dm"
#include "code\datums\nanits\nanites_research\nanite_program_hub.dm"
#include "code\datums\nanits\nanites_research\nanite_programmer.dm"
#include "code\datums\nanits\nanites_research\nanite_programs.dm"
#include "code\datums\nanits\nanites_research\nanite_remote.dm"
#include "code\datums\nanits\nanites_research\nanite_scaner.dm"
#include "code\datums\nanits\nanites_research\program_disk.dm"
#include "code\datums\nanits\nanites_research\public_chamber.dm"
#include "code\datums\nanits\nanites_research\rules.dm"
#include "code\datums\nanits\nanites_research\extra_settings\_extra_settings.dm"
#include "code\datums\nanits\nanites_research\extra_settings\boolean.dm"
#include "code\datums\nanits\nanites_research\extra_settings\number.dm"
#include "code\datums\nanits\nanites_research\extra_settings\text.dm"
#include "code\datums\nanits\nanites_research\extra_settings\type.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\buffing.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\healing.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\protocols.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\rogue.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\sensor.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\suppression.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\utility.dm"
#include "code\datums\nanits\nanites_research\nanite_programs\weapon.dm"
32 changes: 0 additions & 32 deletions tgstation.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6075,36 +6075,4 @@
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
#include "massmeta\includes.dm"
#include "massmeta\code\datums\nanits\nanite_designs.dm"
#include "massmeta\code\datums\nanits\nanite_mood.dm"
#include "massmeta\code\datums\nanits\nanites_circuitboard.dm"
#include "massmeta\code\datums\nanits\nanites_component.dm"
#include "massmeta\code\datums\nanits\nanites_hud.dm"
#include "massmeta\code\datums\nanits\nanites_processing.dm"
#include "massmeta\code\datums\nanits\nanites_techweb.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_chamber.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_chamber_computer.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_cloud_controller.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_injector.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_program_hub.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programmer.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_remote.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_scaner.dm"
#include "massmeta\code\datums\nanits\nanites_research\program_disk.dm"
#include "massmeta\code\datums\nanits\nanites_research\public_chamber.dm"
#include "massmeta\code\datums\nanits\nanites_research\rules.dm"
#include "massmeta\code\datums\nanits\nanites_research\extra_settings\_extra_settings.dm"
#include "massmeta\code\datums\nanits\nanites_research\extra_settings\boolean.dm"
#include "massmeta\code\datums\nanits\nanites_research\extra_settings\number.dm"
#include "massmeta\code\datums\nanits\nanites_research\extra_settings\text.dm"
#include "massmeta\code\datums\nanits\nanites_research\extra_settings\type.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\buffing.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\healing.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\protocols.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\rogue.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\sensor.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\suppression.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\utility.dm"
#include "massmeta\code\datums\nanits\nanites_research\nanite_programs\weapon.dm"
// END_INCLUDE

0 comments on commit e6591bf

Please sign in to comment.