From 079ce6a71f2f7cccc3d351eedfdcc11d73b2345b Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 23 Jul 2016 15:23:54 +0100 Subject: [PATCH] Grammar fix + Ensures Christmas drop pod has trees --- code/game/objects/structures/flora.dm | 5 +++++ code/modules/random_map/drop/drop_types.dm | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 71a87b18b4..d868ebfa51 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -78,6 +78,11 @@ icon = 'icons/obj/plants.dmi' icon_state = "plant-26" +/obj/structure/flora/pottedplant/xmas/New() + ..() + icon_state = "plant-xmas" + + //newbushes /obj/structure/flora/ausbushes diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index 49b9b0f9ab..87d9c699d0 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -175,7 +175,7 @@ datum/supply_drop_loot/riot /obj/item/weapon/reagent_containers/glass/bucket) /datum/supply_drop_loot/food - name = "Emergeny Provisions For Two" + name = "Emergency Provisions For Two" container = /obj/structure/largecrate /datum/supply_drop_loot/food/New() ..() @@ -238,14 +238,14 @@ datum/supply_drop_loot/riot /datum/supply_drop_loot/christmas/New() ..() contents = list( - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, - /obj/item/toy/xmastree, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, + /obj/structure/flora/pottedplant/xmas, /obj/item/clothing/head/santa, /obj/item/clothing/head/santa, /obj/item/clothing/head/santa,