From 82a331e777c2f5cb2edf1c8ada4a5f73a3a506cf Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Thu, 2 Jun 2022 13:39:09 +0300 Subject: [PATCH 1/8] Update computer.dm --- code/modules/shuttle/computer.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 829da6224a1c..642305964b0d 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -137,3 +137,7 @@ /obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) shuttleId = port.id + +/obj/machinery/computer/shuttle/AltClick(user) + if(istype(user, /mob/living/carbon) || istype(user, /mob/living/simple_animal/hostile/asteroid/elite)) + ui_interact(user, null) From 3fc045e2e54c27799a4d48a9f1d8365041afce81 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Sat, 4 Jun 2022 16:50:12 +0300 Subject: [PATCH 2/8] Update meat.dm --- code/modules/food_and_drinks/food/snacks/meat.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index 15c73412feb7..12abbd676081 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -340,18 +340,6 @@ icon_state = "shadowmeat" desc = "It is covered in a strange darkness. This slab's magical properties appear to be drastically weakened due to the synthetic nature of the meat." -/obj/item/reagent_containers/food/snacks/meat/slab/plagued - name = "meat" - desc = "A slab of disease-ridden meat. Eating it is a questionable idea." - icon_state = "meat" - dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/ - bitesize = 3 - list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/plaguebacteria = 3) //It is infected by plague - slice_path = /obj/item/reagent_containers/food/snacks/meat/raw_cutlet/plain - slices_num = 3 - filling_color = "#FF0000" - tastes = list("meat" = 2, "decay" = 1) - foodtype = MEAT | RAW ////////////////////////////////////// MEAT STEAKS /////////////////////////////////////////////////////////// From db1f40761e99e3395158c3c0a443b3efdae5b925 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 7 Jun 2022 16:11:33 +0300 Subject: [PATCH 3/8] Update objects.dm --- code/_globalvars/lists/objects.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 331f30de8bd1..87a4a0f38cb0 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -40,3 +40,5 @@ GLOBAL_LIST_EMPTY(ai_core_displays) GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert GLOBAL_LIST_INIT(alarms, list("Fire" = list(), "Atmosphere" = list(), "Power" = list())) //all engineering alerts for station alert consoles and alarm manager + +GLOBAL_LIST_EMPTY(hog_structures) From 2558753f387843ad6a8530920d15409b834899a1 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:36:00 +0300 Subject: [PATCH 4/8] Update computer.dm --- code/modules/shuttle/computer.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index 642305964b0d..829da6224a1c 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -137,7 +137,3 @@ /obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) shuttleId = port.id - -/obj/machinery/computer/shuttle/AltClick(user) - if(istype(user, /mob/living/carbon) || istype(user, /mob/living/simple_animal/hostile/asteroid/elite)) - ui_interact(user, null) From e5a044ca51e9fadb76cf73b230d6d66a2fd1c236 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:36:31 +0300 Subject: [PATCH 5/8] Update meat.dm --- code/modules/food_and_drinks/food/snacks/meat.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index 12abbd676081..15c73412feb7 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -340,6 +340,18 @@ icon_state = "shadowmeat" desc = "It is covered in a strange darkness. This slab's magical properties appear to be drastically weakened due to the synthetic nature of the meat." +/obj/item/reagent_containers/food/snacks/meat/slab/plagued + name = "meat" + desc = "A slab of disease-ridden meat. Eating it is a questionable idea." + icon_state = "meat" + dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/ + bitesize = 3 + list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/plaguebacteria = 3) //It is infected by plague + slice_path = /obj/item/reagent_containers/food/snacks/meat/raw_cutlet/plain + slices_num = 3 + filling_color = "#FF0000" + tastes = list("meat" = 2, "decay" = 1) + foodtype = MEAT | RAW ////////////////////////////////////// MEAT STEAKS /////////////////////////////////////////////////////////// From 6705493de9ccbbe95b742bc166220935deedf83e Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:36:53 +0300 Subject: [PATCH 6/8] Update objects.dm --- code/_globalvars/lists/objects.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 87a4a0f38cb0..331f30de8bd1 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -40,5 +40,3 @@ GLOBAL_LIST_EMPTY(ai_core_displays) GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert GLOBAL_LIST_INIT(alarms, list("Fire" = list(), "Atmosphere" = list(), "Power" = list())) //all engineering alerts for station alert consoles and alarm manager - -GLOBAL_LIST_EMPTY(hog_structures) From 2e78e10665ff11f899d9c359d8cb65c74b3a38ee Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Sun, 19 Jun 2022 09:42:52 +0300 Subject: [PATCH 7/8] Blobberhud --- code/_onclick/hud/_defines.dm | 3 +++ code/_onclick/hud/blobbernauthud.dm | 13 +++++-------- code/_onclick/hud/screen_objects.dm | 10 +++------- code/modules/antagonists/blob/blob_mobs.dm | 11 +---------- code/modules/antagonists/blob/overmind.dm | 7 ++++--- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 8c4dd2731dfd..9ac9f04a69f1 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -125,6 +125,9 @@ //slimes #define ui_slime_health "EAST,CENTER:15" //same as humans and constructs +//Blobbernauts +#define ui_blobbernaut_overmind_health "EAST-1:28,CENTER+0:19" + // AI #define ui_ai_core "CENTER-6:-32,SOUTH:6" diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm index 17d3b11a7287..1df7bf87d340 100644 --- a/code/_onclick/hud/blobbernauthud.dm +++ b/code/_onclick/hud/blobbernauthud.dm @@ -1,9 +1,6 @@ +/datum/hud/living/blobbernaut/New(mob/living/owner) + . = ..() -/datum/hud/blobbernaut/New(mob/owner) - ..() - - blobpwrdisplay = new /obj/screen/healths/blob/naut/core() - infodisplay += blobpwrdisplay - - healths = new /obj/screen/healths/blob/naut() - infodisplay += healths + blobpwrdisplay = new /obj/screen/healths/blob/overmind() + blobpwrdisplay.hud = src + infodisplay += blobpwrdisplay \ No newline at end of file diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 26af2be2459c..0c1db1bd3dcc 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -607,14 +607,10 @@ screen_loc = ui_internal mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/screen/healths/blob/naut - name = "health" - icon = 'icons/mob/blob.dmi' - icon_state = "nauthealth" - -/obj/screen/healths/blob/naut/core +/obj/screen/healths/blob/overmind name = "overmind health" - screen_loc = ui_health + icon = 'icons/mob/blob.dmi' + screen_loc = ui_blobbernaut_overmind_health icon_state = "corehealth" /obj/screen/healths/guardian diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index fd46dd784e39..0f1f4e0bc40b 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -249,7 +249,7 @@ force_threshold = 10 pressure_resistance = 50 mob_size = MOB_SIZE_LARGE - hud_type = /datum/hud/blobbernaut + hud_type = /datum/hud/living/blobbernaut /mob/living/simple_animal/hostile/blob/blobbernaut/Life() if(..()) @@ -285,15 +285,6 @@ I.color = overmind.blobstrain.complementary_color flick_overlay_view(I, src, 8) -/mob/living/simple_animal/hostile/blob/blobbernaut/adjustHealth(amount, updating_health = TRUE, forced = FALSE) - . = ..() - if(updating_health) - update_health_hud() - -/mob/living/simple_animal/hostile/blob/blobbernaut/update_health_hud() - if(hud_used) - hud_used.healths.maptext = "
[round((health / maxHealth) * 100, 0.5)]%
" - /mob/living/simple_animal/hostile/blob/blobbernaut/AttackingTarget() . = ..() if(. && isliving(target) && overmind) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 4be0c9c35df1..51009e4f542f 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -205,14 +205,15 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/update_health_hud() if(blob_core) - hud_used.healths.maptext = "
[round(blob_core.obj_integrity)]
" + var/current_health = round((blob_core.obj_integrity / blob_core.max_integrity) * 100) + hud_used.healths.maptext = MAPTEXT("
[current_health]%
") for(var/mob/living/simple_animal/hostile/blob/blobbernaut/B in blob_mobs) if(B.hud_used && B.hud_used.blobpwrdisplay) - B.hud_used.blobpwrdisplay.maptext = "
[round(blob_core.obj_integrity)]
" + B.hud_used.blobpwrdisplay.maptext = MAPTEXT("
[current_health]%
") /mob/camera/blob/proc/add_points(points) blob_points = clamp(blob_points + points, 0, max_blob_points) - hud_used.blobpwrdisplay.maptext = "
[round(blob_points)]
" + hud_used.blobpwrdisplay.maptext = MAPTEXT("
[round(blob_points)]
") /mob/camera/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if (!message) From 05fa5920a22be4bd1afda4f842e262a3f322be73 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Sun, 19 Jun 2022 09:49:03 +0300 Subject: [PATCH 8/8] Ass --- code/modules/antagonists/blob/overmind.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 51009e4f542f..343ce60cc267 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -206,14 +206,14 @@ GLOBAL_LIST_EMPTY(blob_nodes) /mob/camera/blob/update_health_hud() if(blob_core) var/current_health = round((blob_core.obj_integrity / blob_core.max_integrity) * 100) - hud_used.healths.maptext = MAPTEXT("
[current_health]%
") + hud_used.healths.maptext = "
[current_health]%
" for(var/mob/living/simple_animal/hostile/blob/blobbernaut/B in blob_mobs) if(B.hud_used && B.hud_used.blobpwrdisplay) - B.hud_used.blobpwrdisplay.maptext = MAPTEXT("
[current_health]%
") + B.hud_used.blobpwrdisplay.maptext = "
[current_health]%
" /mob/camera/blob/proc/add_points(points) blob_points = clamp(blob_points + points, 0, max_blob_points) - hud_used.blobpwrdisplay.maptext = MAPTEXT("
[round(blob_points)]
") + hud_used.blobpwrdisplay.maptext = "
[round(blob_points)]
" /mob/camera/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if (!message)