From 1506653349be3197ef2dcf6ea0636c64b581bc0e Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat, 15 Aug 2020 22:42:39 +0100 Subject: [PATCH 1/3] Deletes butterfly crate --- code/datums/supplypacks.dm | 7 ------- .../game/objects/structures/crates_lockers/crittercrate.dm | 5 ----- 2 files changed, 12 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5b21036b2bc..a36643d15da 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1172,13 +1172,6 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/item/clothing/accessory/petcollar) containername = "fox crate" -/datum/supply_packs/organic/butterfly - name = "Butterflies Crate" - cost = 50 - containertype = /obj/structure/closet/critter/butterfly - containername = "butterflies crate" - contraband = 1 - /datum/supply_packs/organic/deer name = "Deer Crate" cost = 56 //Deer are best. diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index fd726aab6a7..bb67e46e58e 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -81,11 +81,6 @@ name = "fox crate" content_mob = /mob/living/simple_animal/pet/dog/fox -/obj/structure/closet/critter/butterfly - name = "butterflies crate" - content_mob = /mob/living/simple_animal/butterfly - amount = 50 - /obj/structure/closet/critter/deer name = "deer crate" content_mob = /mob/living/simple_animal/deer From 2b48fa853d58f5900d5a6b53fa135d26a30b72ef Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon, 17 Aug 2020 11:19:42 +0100 Subject: [PATCH 2/3] Revert "Deletes butterfly crate" This reverts commit 1506653349be3197ef2dcf6ea0636c64b581bc0e. --- code/datums/supplypacks.dm | 7 +++++++ .../game/objects/structures/crates_lockers/crittercrate.dm | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index a36643d15da..5b21036b2bc 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1172,6 +1172,13 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY contains = list(/obj/item/clothing/accessory/petcollar) containername = "fox crate" +/datum/supply_packs/organic/butterfly + name = "Butterflies Crate" + cost = 50 + containertype = /obj/structure/closet/critter/butterfly + containername = "butterflies crate" + contraband = 1 + /datum/supply_packs/organic/deer name = "Deer Crate" cost = 56 //Deer are best. diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index bb67e46e58e..fd726aab6a7 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -81,6 +81,11 @@ name = "fox crate" content_mob = /mob/living/simple_animal/pet/dog/fox +/obj/structure/closet/critter/butterfly + name = "butterflies crate" + content_mob = /mob/living/simple_animal/butterfly + amount = 50 + /obj/structure/closet/critter/deer name = "deer crate" content_mob = /mob/living/simple_animal/deer From c9f17cab6c38627e4139a42508a78f358ec5694d Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon, 17 Aug 2020 11:20:46 +0100 Subject: [PATCH 3/3] Makes it so 1 butterfly still exists --- code/datums/supplypacks.dm | 5 ++--- code/game/objects/structures/crates_lockers/crittercrate.dm | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5b21036b2bc..c8f2b6bb99b 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1173,11 +1173,10 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containername = "fox crate" /datum/supply_packs/organic/butterfly - name = "Butterflies Crate" + name = "Butterfly Crate" cost = 50 containertype = /obj/structure/closet/critter/butterfly - containername = "butterflies crate" - contraband = 1 + containername = "butterfly crate" /datum/supply_packs/organic/deer name = "Deer Crate" diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index fd726aab6a7..7629fc62918 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -82,9 +82,8 @@ content_mob = /mob/living/simple_animal/pet/dog/fox /obj/structure/closet/critter/butterfly - name = "butterflies crate" + name = "butterfly crate" content_mob = /mob/living/simple_animal/butterfly - amount = 50 /obj/structure/closet/critter/deer name = "deer crate"