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/9] 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/9] 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/9] 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 335ddede4bd5335458a690fb6cc1fc15ae0fdd65 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:27:32 +0300 Subject: [PATCH 4/9] Update generic_positive_events.dm --- code/datums/mood_events/generic_positive_events.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 670be33752ee..0fb6810f229d 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -62,7 +62,7 @@ special_screen_obj = "honked_nose" special_screen_replace = FALSE -/datum/mood_event/perform_cpr +/datum/mood_event/saved_life description = "It feels good to save a life.\n" mood_change = 6 timeout = 5 MINUTES From cfdac2105ec7a49d3902f4b7b13d67d972b70ab7 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:28:03 +0300 Subject: [PATCH 5/9] Update defib.dm --- code/game/objects/items/defib.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 3adaf0c62e96..4106eb536d0e 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -624,6 +624,7 @@ H.emote("gasp") H.Jitter(100) SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "saved_life", /datum/mood_event/saved_life) log_combat(user, H, "revived", defib) if(req_defib) defib.deductcharge(revivecost) From 82a7d9446b51b7c27649320bad9bb5c25591d7ac Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:28:29 +0300 Subject: [PATCH 6/9] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5bb356837e3e..d5c5c39d916e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -627,7 +627,7 @@ return src.visible_message("[src] performs CPR on [C.name]!", span_notice("You perform CPR on [C.name].")) - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "perform_cpr", /datum/mood_event/perform_cpr) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "saved_life", /datum/mood_event/saved_life) C.cpr_time = world.time log_combat(src, C, "CPRed") SSachievements.unlock_achievement(/datum/achievement/cpr, client) From 8458757c5912aae8b0e77fdb5c16cef61d034273 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:31:35 +0300 Subject: [PATCH 7/9] 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 d96c17d70447b277a091340387f986127d9e9af0 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:32:01 +0300 Subject: [PATCH 8/9] 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 b85dd1dfe95bf4c5b1a0e0309fe24efc150c5a32 Mon Sep 17 00:00:00 2001 From: SuperSlayer <91609255+TymurShatillo@users.noreply.github.com> Date: Tue, 14 Jun 2022 20:32:17 +0300 Subject: [PATCH 9/9] 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)