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/7] 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/7] 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/7] 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/7] 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/7] 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/7] 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 ded1027f1fe6d34725ec8c21d12f79322dab7daf Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Sun, 19 Jun 2022 10:02:28 +0300 Subject: [PATCH 7/7] swarmerhud --- code/_onclick/hud/swarmer.dm | 55 ++++++++++++++++++-------------- code/modules/swarmers/swarmer.dm | 2 +- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm index 382e11b2e5b0..5dd4267d9bc8 100644 --- a/code/_onclick/hud/swarmer.dm +++ b/code/_onclick/hud/swarmer.dm @@ -1,68 +1,75 @@ /obj/screen/swarmer icon = 'icons/mob/swarmer.dmi' +/obj/screen/swarmer/MouseEntered(location, control, params) + . = ..() + openToolTip(usr, src, params, title = name, content = desc) + +/obj/screen/swarmer/MouseExited(location, control, params) + closeToolTip(usr) + /obj/screen/swarmer/fabricate_trap icon_state = "ui_trap" - name = "Create trap (Costs 4 Resources)" - desc = "Creates a trap that will nonlethally shock any non-swarmer that attempts to cross it. (Costs 4 resources)" + name = "Create Trap (Costs 4 Resources)" + desc = "Creates a trap that will nonlethally shock any non-swarmer that attempts to cross it." /obj/screen/swarmer/fabricate_trap/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.create_trap() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.create_trap() /obj/screen/swarmer/barricade icon_state = "ui_barricade" - name = "Create barricade (Costs 4 Resources)" - desc = "Creates a destructible barricade that will stop any non swarmer from passing it. Also allows disabler beams to pass through. (Costs 4 resources)" + name = "Create Barricade (Costs 4 Resources)" + desc = "Creates a destructible barricade that will stop any non-swarmer from passing it. Also allows disabler beams to pass through." /obj/screen/swarmer/barricade/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.create_barricade() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.create_barricade() /obj/screen/swarmer/replicate icon_state = "ui_replicate" name = "Replicate (Costs 20 Resources)" - desc = "Creates a drone." + desc = "Creates an autonomous melee drone that will follow you and attack all non-swamers entities in sight. They can be ordered to move to a target location by a middle-click." /obj/screen/swarmer/replicate/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.create_swarmer() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.create_swarmer() /obj/screen/swarmer/repair_self icon_state = "ui_self_repair" - name = "Repair self" - desc = "Repairs damage to our body." + name = "Repair Self" + desc = "Fully repairs damage done to our body after a moderate delay." /obj/screen/swarmer/repair_self/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.repair_self() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.repair_self() /obj/screen/swarmer/toggle_light icon_state = "ui_light" - name = "Toggle light" - desc = "Toggles our inbuilt light on or off." + name = "Toggle Light" + desc = "Toggles our inbuilt light on or off. Follower drones will also synchronize their lights with a master unit." /obj/screen/swarmer/toggle_light/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.toggle_light() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.toggle_light() /obj/screen/swarmer/contact_swarmers icon_state = "ui_contact_swarmers" - name = "Contact swarmers" + name = "Contact Swarmers" desc = "Sends a message to all other swarmers, should they exist." /obj/screen/swarmer/contact_swarmers/Click() if(isswarmer(usr)) - var/mob/living/simple_animal/hostile/swarmer/S = usr - S.contact_swarmers() + var/mob/living/simple_animal/hostile/swarmer/our_swarmer = usr + our_swarmer.contact_swarmers() -/datum/hud/swarmer/New(mob/owner) - ..() +/datum/hud/living/swarmer/New(mob/owner) + . = ..() var/obj/screen/using using = new /obj/screen/swarmer/fabricate_trap() diff --git a/code/modules/swarmers/swarmer.dm b/code/modules/swarmers/swarmer.dm index 471b0a0a0a30..82a215fc4b91 100644 --- a/code/modules/swarmers/swarmer.dm +++ b/code/modules/swarmers/swarmer.dm @@ -59,7 +59,7 @@ del_on_death = 1 deathmessage = "explodes with a sharp pop!" light_color = LIGHT_COLOR_CYAN - hud_type = /datum/hud/swarmer + hud_type = /datum/hud/living/swarmer speech_span = SPAN_ROBOT ///Resource points, generated by consuming metal/glass var/resources = 0