From 83d604d0636167f2d3febf109b21caf77137be28 Mon Sep 17 00:00:00 2001 From: SuperSlayer Date: Sun, 1 May 2022 20:03:36 +0300 Subject: [PATCH 1/3] Sexo --- code/modules/antagonists/brother/brother.dm | 22 +++++++++++++++++-- .../game/objects/items/storage/uplink_kits.dm | 9 ++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 337983202427..455046d21c23 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -21,6 +21,7 @@ SSticker.mode.brothers += owner objectives += team.objectives owner.special_role = special_role + equip_bloodbro() if(owner.current) give_pinpointer() finalize_brother() @@ -99,7 +100,7 @@ var/datum/antagonist/traitor/tot = new() tot.give_objectives = FALSE - + for(var/datum/objective/obj in objectives) var/obj_type = obj.type var/datum/objective/new_obj = new obj_type() @@ -108,7 +109,7 @@ tot.add_objective(new_obj) qdel(obj) objectives.Cut() - + owner.add_antag_datum(tot) owner.remove_antag_datum(/datum/antagonist/brother) @@ -192,3 +193,20 @@ /datum/team/brother_team/antag_listing_name() return "[name] blood brothers" + +/datum/antagonist/brother/proc/equip_bloodbro() + if(!owner || !owner.current || !ishuman(owner.current)) + return + var/list/possible_items = list(/obj/item/soap/syndie,/obj/item/pen/sleepy,/obj/item/pen/edagger,/obj/item/codespeak_manual/unlimited, + /obj/item/clothing/shoes/chameleon/noslip/syndicate, /obj/item/armorpolish, /obj/item/storage/box/syndie_kit/c4kit + /obj/item/storage/box/syndie_kit/throwing_weapons, /obj/item/gun/ballistic/automatic/c20r/toy, /obj/item/storage/box/syndie_kit/emp, + /obj/item/card/id/syndicate, /obj/item/syndicateReverseCard, /obj/item/multitool/ai_detect, /obj/item/storage/box/syndie_kit/chameleon, + /obj/item/storage/box/fancy/cigarettes/cigpack_syndicate) + var/obj/item/implant/storage/S = locate(/obj/item/implant/storage) in owner.current + if(!S) + S = new(owner.current) + S.implant(owner.current) + var/I = pick(possible_items) + if(ispath(I)) + I = new I() + SEND_SIGNAL(S, COMSIG_TRY_STORAGE_INSERT, I, null, TRUE, TRUE) \ No newline at end of file diff --git a/yogstation/code/game/objects/items/storage/uplink_kits.dm b/yogstation/code/game/objects/items/storage/uplink_kits.dm index 61a018dbeb52..b3edc199f049 100644 --- a/yogstation/code/game/objects/items/storage/uplink_kits.dm +++ b/yogstation/code/game/objects/items/storage/uplink_kits.dm @@ -30,3 +30,12 @@ new /obj/item/autosurgeon/plasmavessel(src) new /obj/item/organ/alien/resinspinner(src) new /obj/item/organ/alien/acid(src) + + +/obj/item/storage/box/syndie_kit/c4kit + name = "C4 Box" + +/obj/item/storage/box/syndie_kit/c4kit/PopulateContents() + new /obj/item/grenade/plastic/c4 + new /obj/item/grenade/plastic/c4 + new /obj/item/grenade/plastic/c4 \ No newline at end of file From 44f7ce1b1308e9f069af5e93411cbae9374feda7 Mon Sep 17 00:00:00 2001 From: SuperSlayer Date: Sun, 1 May 2022 20:06:15 +0300 Subject: [PATCH 2/3] Amog --- code/modules/antagonists/brother/brother.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 455046d21c23..2f16bc8b1fba 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -198,10 +198,10 @@ if(!owner || !owner.current || !ishuman(owner.current)) return var/list/possible_items = list(/obj/item/soap/syndie,/obj/item/pen/sleepy,/obj/item/pen/edagger,/obj/item/codespeak_manual/unlimited, - /obj/item/clothing/shoes/chameleon/noslip/syndicate, /obj/item/armorpolish, /obj/item/storage/box/syndie_kit/c4kit + /obj/item/clothing/shoes/chameleon/noslip/syndicate, /obj/item/armorpolish, /obj/item/storage/box/syndie_kit/c4kit, /obj/item/storage/box/syndie_kit/throwing_weapons, /obj/item/gun/ballistic/automatic/c20r/toy, /obj/item/storage/box/syndie_kit/emp, /obj/item/card/id/syndicate, /obj/item/syndicateReverseCard, /obj/item/multitool/ai_detect, /obj/item/storage/box/syndie_kit/chameleon, - /obj/item/storage/box/fancy/cigarettes/cigpack_syndicate) + /obj/item/storage/box/fancy/cigarettes/cigpack_syndicate,) var/obj/item/implant/storage/S = locate(/obj/item/implant/storage) in owner.current if(!S) S = new(owner.current) From ce34e9974a72ce8511845f956c488566167ca2a5 Mon Sep 17 00:00:00 2001 From: SuperSlayer Date: Sun, 1 May 2022 20:22:50 +0300 Subject: [PATCH 3/3] Sus --- code/modules/antagonists/brother/brother.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 2f16bc8b1fba..fe2b121a1572 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -60,6 +60,7 @@ var/brother_text = get_brother_names() to_chat(owner.current, span_alertsyndie("You are the [owner.special_role] of [brother_text].")) to_chat(owner.current, "The Syndicate only accepts those that have proven themselves. Prove yourself and prove your [team.member_name]s by completing your objectives together!") + to_chat(owner.current, "You both start with a storage implant containing one item, chosen by your employers. Use it wise!") owner.announce_objectives() give_meeting_area()