From 21a7c1098dc200967ea77ba0b32af2afa98e2247 Mon Sep 17 00:00:00 2001 From: Kabra_men <46802162+Kabramen@users.noreply.github.com> Date: Tue, 4 May 2021 12:01:54 -0300 Subject: [PATCH 1/2] Condom economy expasion --- code/modules/cargo/exports/lewd.dm | 7 +++++++ tgstation.dme | 1 + 2 files changed, 8 insertions(+) create mode 100644 code/modules/cargo/exports/lewd.dm diff --git a/code/modules/cargo/exports/lewd.dm b/code/modules/cargo/exports/lewd.dm new file mode 100644 index 00000000..bbd9110e --- /dev/null +++ b/code/modules/cargo/exports/lewd.dm @@ -0,0 +1,7 @@ + +//Condom +/datum/export/gear/condom + cost = 150 + unit_name = "filled condom" + export_types = list(/obj/item/condom/filled) + include_subtypes = TRUE diff --git a/tgstation.dme b/tgstation.dme index aee9875b..128ccd19 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1553,6 +1553,7 @@ #include "code\modules\cargo\exports\food_wine.dm" #include "code\modules\cargo\exports\gear.dm" #include "code\modules\cargo\exports\large_objects.dm" +#include "code\modules\cargo\exports\lewd.dm" #include "code\modules\cargo\exports\manifest.dm" #include "code\modules\cargo\exports\materials.dm" #include "code\modules\cargo\exports\organs_robotics.dm" From ebce3afd96033c440841e0e5b92b836f1c120097 Mon Sep 17 00:00:00 2001 From: Kabra_men <46802162+Kabramen@users.noreply.github.com> Date: Tue, 4 May 2021 13:05:37 -0300 Subject: [PATCH 2/2] Bounty --- code/modules/cargo/bounties/assistant.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 5601dfe4..613f9872 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -236,3 +236,10 @@ reward = 2250 required_count = 5 wanted_types = list(/obj/structure/chair/plaswood) + +/datum/bounty/item/assistant/condom + name = "Filled Condom" + description = "Something wack is happening at Central Command, and now they requested some filled condoms?" + reward = 1150 + required_count = 5 + wanted_types = list(/obj/item/condom/filled) \ No newline at end of file