cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Grammar fix + Ensures Christmas drop pod has trees

Browse Source
This commit is contained in:
Yoshax
2016-07-23 15:23:54 +01:00
parent d659dd9208
commit 079ce6a71f
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/structures/flora.dm
View File

@@ -78,6 +78,11 @@
icon = 'icons/obj/plants.dmi' icon = 'icons/obj/plants.dmi'
icon_state = "plant-26" icon_state = "plant-26"
/obj/structure/flora/pottedplant/xmas/New()
..()
icon_state = "plant-xmas"
//newbushes //newbushes
/obj/structure/flora/ausbushes /obj/structure/flora/ausbushes

18
code/modules/random_map/drop/drop_types.dm
View File

@@ -175,7 +175,7 @@ datum/supply_drop_loot/riot
/obj/item/weapon/reagent_containers/glass/bucket) /obj/item/weapon/reagent_containers/glass/bucket)
/datum/supply_drop_loot/food /datum/supply_drop_loot/food
name = "Emergeny Provisions For Two" name = "Emergency Provisions For Two"
container = /obj/structure/largecrate container = /obj/structure/largecrate
/datum/supply_drop_loot/food/New() /datum/supply_drop_loot/food/New()
..() ..()
@@ -238,14 +238,14 @@ datum/supply_drop_loot/riot
/datum/supply_drop_loot/christmas/New() /datum/supply_drop_loot/christmas/New()
..() ..()
contents = list( contents = list(
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/toy/xmastree, /obj/structure/flora/pottedplant/xmas,
/obj/item/clothing/head/santa, /obj/item/clothing/head/santa,
/obj/item/clothing/head/santa, /obj/item/clothing/head/santa,
/obj/item/clothing/head/santa, /obj/item/clothing/head/santa,